* [GIT] Networking
@ 2011-01-14 21:03 David Miller
2011-01-19 9:59 ` netconsole build breakage (Re: [GIT] Networking) Ingo Molnar
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-01-14 21:03 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
1) NAPI and SMP locking bug fixes in GRETH from Daniel Hellstrom.
2) Fix Cassini driver build on x86.
3) Fix unhandled IRQs in e1000, from Jesse Brandeburg.
4) SFC accidently stopped adhering to rss_cpus module parm, from
Ben Hutchings.
5) IPV6 forwarding path must check skb->packet_type for PACKET_HOST,
otherwise we get packet storms, fix from Alexey Kuznetsov.
6) rndis driver can deadlock in stats handling, part of the problem is
the use of dev_txq_stats_fold() which makes this situation too easy
to get into. Kill the interface and convert the small number of
existing users, thus fixing the rndis deadlocks. From Eric Dumazet.
7) tproxy w/o conntrack build fix in netfilter, from KOVACS Krisztian.
8) ath9k wireless fixes from Sujith Manoharan.
9) Fix ctnetlink error signalling such that we don't loop forever
in some situations, from Pablo Neira Ayuso.
10) Kernel doc fixups from Randy Dunlap.
11) Wireless stack kernel doc and other comment fixes from Johannes Berg.
Please pull, thanks a lot!
The following changes since commit 4162cf64973df51fc885825bc9ca4d055891c49f:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2011-01-11 16:32:41 -0800)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Alexey Kuznetsov (1):
inet6: prevent network storms caused by linux IPv6 routers
Ben Hutchings (4):
sfc: Make efx_get_tx_queue() an inline function
sfc: Restore the effect of the rss_cpus module parameter
ks8695net: Disable non-working ethtool operations
ks8695net: Use default implementation of ethtool_ops::get_link
Bruce Allan (2):
e1000e: update Copyright for 2011
e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs
Christian Lamparter (1):
p54: fix sequence no. accounting off-by-one error
Daniel Hellstrom (7):
GRETH: added raw AMBA vendor/device number to match against.
GRETH: fix opening/closing
GRETH: GBit transmit descriptor handling optimization
GRETH: fixed skb buffer memory leak on frame errors
GRETH: avoid writing bad speed/duplex when setting transfer mode
GRETH: handle frame error interrupts
GRETH: resolve SMP issues and other problems
David S. Miller (7):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
cassini: Fix build bustage on x86.
Merge branch 'vhost-net' of git://git.kernel.org/.../mst/vhost
Merge branch 'master' of git://git.kernel.org/.../bwh/sfc-2.6
Merge branch 'master' of master.kernel.org:/.../jkirsher/net-2.6
Eric Dumazet (1):
net: remove dev_txq_stats_fold()
Indan Zupancic (1):
ipw2200: Check for -1 INTA in tasklet too.
Jesper Juhl (2):
vxge: Remember to release firmware after upgrading firmware
USB CDC NCM: Don't deref NULL in cdc_ncm_rx_fixup() and don't use uninitialized variable.
Jesse Brandeburg (1):
e1000: Avoid unhandled IRQ
Joe Perches (2):
bna: Remove unnecessary memset(,0,)
netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr
Johannes Berg (5):
mac80211: add remain-on-channel docs
mac80211: add missing docs for off-chan TX flag
cfg80211: add mesh join/leave callback docs
nl80211: add/fix mesh docs
mac80211: add doc short section on LED triggers
KOVACS Krisztian (1):
netfilter: fix compilation when conntrack is disabled but tproxy is enabled
Kees Cook (1):
net: ax25: fix information leak to userland harder
Michael Buesch (1):
ssb: Ignore dangling ethernet cores on wireless devices
Michael S. Tsirkin (1):
vhost: fix signed/unsigned comparison
Nicolas Dichtel (1):
ipsec: update MAX_AH_AUTH_LEN to support sha512
Pablo Neira Ayuso (1):
netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()
Randy Dunlap (1):
eth: fix new kernel-doc warning
Stanislaw Gruszka (1):
hostap_cs: fix sleeping function called from invalid context
Sujith Manoharan (5):
ath9k_hw: Fix chip test
ath9k_hw: Fix calibration for AR9287 devices
ath9k_hw: Fix thermal issue with UB94
ath9k_hw: Fix RX handling for USB devices
ath9k_htc: Really fix packet injection
Tobias Klauser (4):
netdev: ucc_geth: Use is_multicast_ether_addr helper
netdev: bfin_mac: Use is_multicast_ether_addr helper
etherdevice.h: Add is_unicast_ether_addr function
netdev: tilepro: Use is_unicast_ether_addr helper
françois romieu (1):
r8169: keep firmware in memory.
stephen hemminger (1):
sched: remove unused backlog in RED stats
Documentation/DocBook/80211.tmpl | 21 ++-
drivers/net/arm/ks8695net.c | 288 ++++++++----------------
drivers/net/bfin_mac.c | 9 +-
drivers/net/bna/bnad_ethtool.c | 1 -
drivers/net/cassini.c | 6 +-
drivers/net/e1000/e1000_main.c | 10 +-
drivers/net/e1000e/82571.c | 4 +-
drivers/net/e1000e/Makefile | 2 +-
drivers/net/e1000e/defines.h | 2 +-
drivers/net/e1000e/e1000.h | 2 +-
drivers/net/e1000e/es2lan.c | 2 +-
drivers/net/e1000e/ethtool.c | 2 +-
drivers/net/e1000e/hw.h | 4 +-
drivers/net/e1000e/ich8lan.c | 2 +-
drivers/net/e1000e/lib.c | 20 +-
drivers/net/e1000e/netdev.c | 223 +++++++++---------
drivers/net/e1000e/param.c | 6 +-
drivers/net/e1000e/phy.c | 4 +-
drivers/net/gianfar.c | 10 +-
drivers/net/gianfar.h | 10 +
drivers/net/greth.c | 221 +++++++++++--------
drivers/net/greth.h | 2 +
drivers/net/ixgbe/ixgbe_main.c | 23 ++-
drivers/net/macvtap.c | 2 +-
drivers/net/r8169.c | 43 +++-
drivers/net/sfc/efx.c | 18 +-
drivers/net/sfc/net_driver.h | 10 +-
drivers/net/tile/tilepro.c | 10 +-
drivers/net/ucc_geth.c | 2 +-
drivers/net/usb/cdc_ncm.c | 4 +-
drivers/net/vxge/vxge-main.c | 1 +
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 3 +
drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 37 +++-
drivers/net/wireless/ath/ath9k/hw.c | 5 +-
drivers/net/wireless/hostap/hostap_cs.c | 15 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 7 +
drivers/net/wireless/p54/txrx.c | 2 +-
drivers/ssb/scan.c | 10 +
drivers/vhost/vhost.c | 18 +-
include/linux/etherdevice.h | 11 +
include/linux/netdevice.h | 5 -
include/linux/nl80211.h | 20 ++-
include/linux/skbuff.h | 15 ++
include/net/ah.h | 2 +-
include/net/cfg80211.h | 2 +
include/net/mac80211.h | 14 ++
include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 10 -
include/net/netfilter/ipv6/nf_defrag_ipv6.h | 10 +
include/net/red.h | 1 -
net/ax25/af_ax25.c | 2 +-
net/core/dev.c | 29 ---
net/core/skbuff.c | 2 +
net/ethernet/eth.c | 2 +-
net/ipv6/ip6_output.c | 3 +
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 8 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/sched/sch_teql.c | 26 ++-
59 files changed, 655 insertions(+), 576 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* netconsole build breakage (Re: [GIT] Networking)
2011-01-14 21:03 [GIT] Networking David Miller
@ 2011-01-19 9:59 ` Ingo Molnar
2011-01-19 10:08 ` Américo Wang
0 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2011-01-19 9:59 UTC (permalink / raw)
To: David Miller, Nicholas Bellinger, James Bottomley, Randy Dunlap
Cc: torvalds, akpm, netdev, linux-kernel
FYI, there's a .38-rc1 build failure that triggers rather often:
drivers/built-in.o: In function `drop_netconsole_target':
netconsole.c:(.text+0x130146): undefined reference to `config_item_put'
drivers/built-in.o: In function `write_msg':
netconsole.c:(.text+0x1301aa): undefined reference to `config_item_get'
netconsole.c:(.text+0x130217): undefined reference to `config_item_put'
drivers/built-in.o: In function `netconsole_netdev_event':
netconsole.c:(.text+0x1302ab): undefined reference to `config_item_get'
...
Triggered by this configuration:
CONFIG_CONFIGFS_FS=m
CONFIG_NETCONSOLE=y
Probably caused by:
d9f9ab51e55e: net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS
The commit appears to have gone upstream via the iscsi tree. The commit is going in
the wrong direction as well, beyond being buggy.
The original problem was caused by this iscsi commit:
e205117285d6: configfs: change depends -> select SYSFS
and the dependency problems snowballed from there, and one side-effect was patched
up - but others remain.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netconsole build breakage (Re: [GIT] Networking)
2011-01-19 9:59 ` netconsole build breakage (Re: [GIT] Networking) Ingo Molnar
@ 2011-01-19 10:08 ` Américo Wang
2011-01-19 10:33 ` Nicholas A. Bellinger
0 siblings, 1 reply; 6+ messages in thread
From: Américo Wang @ 2011-01-19 10:08 UTC (permalink / raw)
To: Ingo Molnar
Cc: David Miller, Nicholas Bellinger, James Bottomley, Randy Dunlap,
torvalds, akpm, netdev, linux-kernel
On Wed, Jan 19, 2011 at 10:59:20AM +0100, Ingo Molnar wrote:
>
>FYI, there's a .38-rc1 build failure that triggers rather often:
>
> drivers/built-in.o: In function `drop_netconsole_target':
> netconsole.c:(.text+0x130146): undefined reference to `config_item_put'
> drivers/built-in.o: In function `write_msg':
> netconsole.c:(.text+0x1301aa): undefined reference to `config_item_get'
> netconsole.c:(.text+0x130217): undefined reference to `config_item_put'
> drivers/built-in.o: In function `netconsole_netdev_event':
> netconsole.c:(.text+0x1302ab): undefined reference to `config_item_get'
> ...
>
>Triggered by this configuration:
>
> CONFIG_CONFIGFS_FS=m
> CONFIG_NETCONSOLE=y
>
Should be "depends on CONFIGFS_FS=y".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netconsole build breakage (Re: [GIT] Networking)
2011-01-19 10:08 ` Américo Wang
@ 2011-01-19 10:33 ` Nicholas A. Bellinger
2011-01-19 10:57 ` Ingo Molnar
2011-01-27 15:51 ` Ingo Molnar
0 siblings, 2 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-19 10:33 UTC (permalink / raw)
To: Américo Wang
Cc: Ingo Molnar, David Miller, James Bottomley, Randy Dunlap,
torvalds, akpm, netdev, linux-kernel, Joel Becker
On Wed, 2011-01-19 at 18:08 +0800, Américo Wang wrote:
> On Wed, Jan 19, 2011 at 10:59:20AM +0100, Ingo Molnar wrote:
> >
> >FYI, there's a .38-rc1 build failure that triggers rather often:
> >
> > drivers/built-in.o: In function `drop_netconsole_target':
> > netconsole.c:(.text+0x130146): undefined reference to `config_item_put'
> > drivers/built-in.o: In function `write_msg':
> > netconsole.c:(.text+0x1301aa): undefined reference to `config_item_get'
> > netconsole.c:(.text+0x130217): undefined reference to `config_item_put'
> > drivers/built-in.o: In function `netconsole_netdev_event':
> > netconsole.c:(.text+0x1302ab): undefined reference to `config_item_get'
> > ...
> >
> >Triggered by this configuration:
> >
> > CONFIG_CONFIGFS_FS=m
> > CONFIG_NETCONSOLE=y
> >
>
> Should be "depends on CONFIGFS_FS=y".
Sorry for breaking this one folks..
Where this was left yesterday was to change NETCONSOLE_DYNAMIC, DLM and
OCFS2_FS symbols to use 'select configfs' instead of 'depends on SYSFS
&& CONFIGFS':
http://marc.info/?l=linux-kernel&m=129539400709508&w=2
but unfortuately this did not make it into .38-rc1 in time..
Using 'select CONFIGFS_FS' here for NETCONSOLE_DYNAMIC with the
following patches should do the trick.
git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-linus
Thanks,
Nicholas Bellinger (3):
net: Make NETCONSOLE_DYNAMIC use select CONFIGFS_FS
dlm: Make DLM use select CONFIGFS_FS
ocfs2: Make OCFS2_FS use select CONFIGFS_FS
drivers/net/Kconfig | 3 ++-
fs/dlm/Kconfig | 4 ++--
fs/ocfs2/Kconfig | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netconsole build breakage (Re: [GIT] Networking)
2011-01-19 10:33 ` Nicholas A. Bellinger
@ 2011-01-19 10:57 ` Ingo Molnar
2011-01-27 15:51 ` Ingo Molnar
1 sibling, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2011-01-19 10:57 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: Américo Wang, David Miller, James Bottomley, Randy Dunlap,
torvalds, akpm, netdev, linux-kernel, Joel Becker
* Nicholas A. Bellinger <nab@linux-iscsi.org> wrote:
> On Wed, 2011-01-19 at 18:08 +0800, Américo Wang wrote:
> > On Wed, Jan 19, 2011 at 10:59:20AM +0100, Ingo Molnar wrote:
> > >
> > >FYI, there's a .38-rc1 build failure that triggers rather often:
> > >
> > > drivers/built-in.o: In function `drop_netconsole_target':
> > > netconsole.c:(.text+0x130146): undefined reference to `config_item_put'
> > > drivers/built-in.o: In function `write_msg':
> > > netconsole.c:(.text+0x1301aa): undefined reference to `config_item_get'
> > > netconsole.c:(.text+0x130217): undefined reference to `config_item_put'
> > > drivers/built-in.o: In function `netconsole_netdev_event':
> > > netconsole.c:(.text+0x1302ab): undefined reference to `config_item_get'
> > > ...
> > >
> > >Triggered by this configuration:
> > >
> > > CONFIG_CONFIGFS_FS=m
> > > CONFIG_NETCONSOLE=y
> > >
> >
> > Should be "depends on CONFIGFS_FS=y".
>
> Sorry for breaking this one folks..
>
> Where this was left yesterday was to change NETCONSOLE_DYNAMIC, DLM and
> OCFS2_FS symbols to use 'select configfs' instead of 'depends on SYSFS
> && CONFIGFS':
>
> http://marc.info/?l=linux-kernel&m=129539400709508&w=2
>
> but unfortuately this did not make it into .38-rc1 in time..
>
> Using 'select CONFIGFS_FS' here for NETCONSOLE_DYNAMIC with the
> following patches should do the trick.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-linus
>
> Thanks,
>
> Nicholas Bellinger (3):
> net: Make NETCONSOLE_DYNAMIC use select CONFIGFS_FS
> dlm: Make DLM use select CONFIGFS_FS
> ocfs2: Make OCFS2_FS use select CONFIGFS_FS
>
> drivers/net/Kconfig | 3 ++-
Yeah, using select CONFIGFS_FS (and removing the SYSFS and CONFIGFS_FS dependencies)
is the correct and clean solution here.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netconsole build breakage (Re: [GIT] Networking)
2011-01-19 10:33 ` Nicholas A. Bellinger
2011-01-19 10:57 ` Ingo Molnar
@ 2011-01-27 15:51 ` Ingo Molnar
1 sibling, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2011-01-27 15:51 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: Américo Wang, David Miller, James Bottomley, Randy Dunlap,
torvalds, akpm, netdev, linux-kernel, Joel Becker
* Nicholas A. Bellinger <nab@linux-iscsi.org> wrote:
> On Wed, 2011-01-19 at 18:08 +0800, Américo Wang wrote:
> > On Wed, Jan 19, 2011 at 10:59:20AM +0100, Ingo Molnar wrote:
> > >
> > >FYI, there's a .38-rc1 build failure that triggers rather often:
> > >
> > > drivers/built-in.o: In function `drop_netconsole_target':
> > > netconsole.c:(.text+0x130146): undefined reference to `config_item_put'
> > > drivers/built-in.o: In function `write_msg':
> > > netconsole.c:(.text+0x1301aa): undefined reference to `config_item_get'
> > > netconsole.c:(.text+0x130217): undefined reference to `config_item_put'
> > > drivers/built-in.o: In function `netconsole_netdev_event':
> > > netconsole.c:(.text+0x1302ab): undefined reference to `config_item_get'
> > > ...
> > >
> > >Triggered by this configuration:
> > >
> > > CONFIG_CONFIGFS_FS=m
> > > CONFIG_NETCONSOLE=y
> > >
> >
> > Should be "depends on CONFIGFS_FS=y".
>
> Sorry for breaking this one folks..
>
> Where this was left yesterday was to change NETCONSOLE_DYNAMIC, DLM and
> OCFS2_FS symbols to use 'select configfs' instead of 'depends on SYSFS
> && CONFIGFS':
>
> http://marc.info/?l=linux-kernel&m=129539400709508&w=2
>
> but unfortuately this did not make it into .38-rc1 in time..
>
> Using 'select CONFIGFS_FS' here for NETCONSOLE_DYNAMIC with the
> following patches should do the trick.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-linus
>
> Thanks,
>
> Nicholas Bellinger (3):
> net: Make NETCONSOLE_DYNAMIC use select CONFIGFS_FS
> dlm: Make DLM use select CONFIGFS_FS
> ocfs2: Make OCFS2_FS use select CONFIGFS_FS
>
> drivers/net/Kconfig | 3 ++-
> fs/dlm/Kconfig | 4 ++--
> fs/ocfs2/Kconfig | 3 ++-
> 3 files changed, 6 insertions(+), 4 deletions(-)
Ping? This is still broken in Linus's tree as of today ... simple builds like
allmodconfig still fail.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-27 15:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-14 21:03 [GIT] Networking David Miller
2011-01-19 9:59 ` netconsole build breakage (Re: [GIT] Networking) Ingo Molnar
2011-01-19 10:08 ` Américo Wang
2011-01-19 10:33 ` Nicholas A. Bellinger
2011-01-19 10:57 ` Ingo Molnar
2011-01-27 15:51 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).