Home » Mailing list archives » linux-netdev » 2009 » June » 18

Re: [GIT]: Networking

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Tilman Schmidt
Subject: Re: [GIT]: Networking
Date: Thursday, June 18, 2009 - 4:18 pm

Am 15.06.2009 14:04 schrieb David Miller:

It seems something went wrong with the merge. After:

commit aba7453037c3a90714caae77a622dceaf1173786
Merge: a4fe91e 93af7ac
Author: David S. Miller <davem@davemloft.net>
Date:   Wed Apr 29 20:30:35 2009 -0700

    Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    Conflicts:
        Documentation/isdn/00-INDEX
        drivers/net/wireless/iwlwifi/iwl-scan.c
        drivers/net/wireless/rndis_wlan.c
        net/mac80211/main.c

lines 22..28 of Documentation/isdn/00-INDEX now look like this:

       - info on the drivers for Siemens Gigaset ISDN adapters.
README.icn
       - info on the ICN-ISDN-card and its driver.
README.HiSax
       - info on the HiSax driver which replaces the old teles.
README.audio

Also, some of the entries, such as README.audio and README.icn, are now duplicated.
Can that be repaired, or would you like me to prepare a patch cleaning it up?

Thanks,
Tilman
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[GIT]: Networking, David Miller, (Mon Jun 15, 5:04 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 2:15 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 2:19 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 2:21 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 2:26 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 2:33 am)
Re: [GIT]: Networking, Alan Cox, (Tue Jun 16, 2:44 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 2:44 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 2:48 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 2:56 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 3:11 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 3:35 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 3:47 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 3:53 am)
Re: [GIT]: Networking, Ingo Molnar, (Tue Jun 16, 5:24 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 5:39 am)
Re: [GIT]: Networking, Eric Dumazet, (Tue Jun 16, 6:38 am)
Re: [GIT]: Networking, Eric Dumazet, (Tue Jun 16, 7:19 am)
Re: [GIT]: Networking, Linus Torvalds, (Tue Jun 16, 11:59 am)
Re: [GIT]: Networking, David Miller, (Tue Jun 16, 12:08 pm)
Re: [GIT]: Networking, Eric Dumazet, (Tue Jun 16, 12:37 pm)
Re: [GIT]: Networking, Eric Dumazet, (Tue Jun 16, 1:12 pm)
[PATCH] net: correct off-by-one write allocations reports, Eric Dumazet, (Tue Jun 16, 11:41 pm)
[bug] __nf_ct_refresh_acct(): WARNING: at lib/list_debug.c ..., Ingo Molnar, (Wed Jun 17, 2:21 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 3:18 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Ingo Molnar, (Wed Jun 17, 4:08 am)
[PATCH] atm: sk_wmem_alloc initial value is one, Eric Dumazet, (Wed Jun 17, 4:31 am)
Re: [GIT]: Networking, David Miller, (Wed Jun 17, 4:32 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., David Miller, (Wed Jun 17, 4:35 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 4:38 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 4:51 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 4:55 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 5:00 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 5:33 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 5:36 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 6:27 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 6:29 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 7:23 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 8:29 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Wed Jun 17, 8:34 am)
Re: [PATCH] net: correct off-by-one write allocations reports, David Miller, (Wed Jun 17, 7:05 pm)
Re: [PATCH] atm: sk_wmem_alloc initial value is one, David Miller, (Wed Jun 17, 7:06 pm)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Ingo Molnar, (Wed Jun 17, 10:23 pm)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Wed Jun 17, 10:58 pm)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Thu Jun 18, 2:47 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Thu Jun 18, 7:56 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Eric Dumazet, (Thu Jun 18, 8:46 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Thu Jun 18, 9:09 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Pablo Neira Ayuso, (Thu Jun 18, 9:13 am)
[PATCH] netfilter: conntrack: death_by_timeout() fix, Eric Dumazet, (Thu Jun 18, 3:46 pm)
Re: [GIT]: Networking, Tilman Schmidt, (Thu Jun 18, 4:18 pm)
Re: [GIT]: Networking, David Miller, (Thu Jun 18, 8:36 pm)
Re: [PATCH] netfilter: conntrack: death_by_timeout() fix, Patrick McHardy, (Fri Jun 19, 4:15 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Ingo Molnar, (Sat Jun 20, 8:47 am)
Re: [bug] __nf_ct_refresh_acct(): WARNING: at lib/list_deb ..., Patrick McHardy, (Sat Jun 20, 8:56 am)