iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
464763cf1c
linux/net/rds
History
Linus Torvalds d7fc02c7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c
2009-12-08 07:55:01 -08:00
..
af_rds.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
bind.c RDS: Add a debug message suggesting to load transport modules 2009-08-23 19:13:14 -07:00
cong.c RDS: Do not send congestion updates to loopback connections 2009-10-30 15:06:39 -07:00
connection.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
ib_cm.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
ib_rdma.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
ib_recv.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
ib_ring.c RDS/IW+IB: Set recv ring low water mark to 1/2 full. 2009-04-09 17:21:14 -07:00
ib_send.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
ib_stats.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
ib_sysctl.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
ib.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
ib.h RDS/IB+IW: Move recv processing to a tasklet 2009-10-30 15:06:39 -07:00
info.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
info.h RDS: Info and stats 2009-02-26 23:39:25 -08:00
iw_cm.c RDS/IB+IW: Move recv processing to a tasklet 2009-10-30 15:06:39 -07:00
iw_rdma.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
iw_recv.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
iw_ring.c RDS/IW+IB: Set recv ring low water mark to 1/2 full. 2009-04-09 17:21:14 -07:00
iw_send.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
iw_stats.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
iw_sysctl.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
iw.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
iw.h RDS/IB+IW: Move recv processing to a tasklet 2009-10-30 15:06:39 -07:00
Kconfig RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
loop.c RDS: loopback 2009-02-26 23:39:26 -08:00
loop.h RDS: loopback 2009-02-26 23:39:26 -08:00
Makefile RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
message.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
page.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
rdma_transport.c RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
rdma_transport.h RDS: Common RDMA transport code 2009-02-26 23:39:33 -08:00
rdma.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
rdma.h RDS: Add GET_MR_FOR_DEST sockopt 2009-10-30 15:06:37 -07:00
rds.h RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
recv.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
send.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
stats.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
sysctl.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
tcp_connect.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_listen.c inet: rename some inet_sock fields 2009-10-18 18:52:53 -07:00
tcp_recv.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_send.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_stats.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
tcp.h RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
threads.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
transport.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00