mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-08 11:37:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb9ffb76949cd7b17c8468f8bf10d0ff75d4cdd2
linux/net
History
David S. Miller 220b07e90e batman-adv: Fix merge error. 
I didn't resolve the merge properly during the last pull of the net
tree into net-next.

The code in the final resolution should set flags to TT_CLIENT_ROAM
not TT_CLIENT_PENDING.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-12-16 15:07:28 -05:00
..
9p
net/9p: Convert net/9p protocol dumps to tracepoints
2011-10-24 11:13:12 -05:00
802
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
8021q
vlan: static functions
2011-12-14 02:39:30 -05:00
appletalk
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
atm
net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.
2011-12-05 15:20:19 -05:00
ax25
NET: AX.25: Check ioctl arguments to avoid overflows further down the road.
2011-11-29 00:23:12 -05:00
batman-adv
batman-adv: Fix merge error.
2011-12-16 15:07:28 -05:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2011-12-09 14:07:12 -05:00
bridge
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
caif
caif: Replace BUG_ON with WARN_ON.
2011-12-06 17:21:47 -05:00
can
can: remove references to berlios mailinglist
2011-10-17 19:22:46 -04:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2011-11-21 12:11:13 -08:00
core
ethtool: Define and apply a default policy for RX flow hash indirection
2011-12-16 13:53:18 -05:00
dcb
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
dccp
sock_diag: Fix module netlink aliases
2011-12-16 13:48:27 -05:00
decnet
net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.
2011-12-05 15:20:19 -05:00
dns_resolver
KEYS: Improve /proc/keys
2011-03-17 11:59:32 +11:00
dsa
dsa: Move switch drivers to new directory drivers/net/dsa
2011-11-29 00:21:36 -05:00
econet
net: Remove all uses of LL_ALLOCATED_SPACE
2011-11-18 14:37:09 -05:00
ethernet
net: don't clear IFF_XMIT_DST_RELEASE in ether_setup
2011-09-15 14:49:44 -04:00
ieee802154
net: Remove all uses of LL_ALLOCATED_SPACE
2011-11-18 14:37:09 -05:00
ipv4
sock_diag: Generalize requests cookies managements
2011-12-16 13:48:27 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-16 02:11:14 -05:00
ipx
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
irda
irttp: Use kmemdup rather than duplicating its implementation
2011-11-21 15:02:17 -05:00
iucv
net: more accurate skb truesize
2011-10-13 16:05:07 -04:00
key
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
l2tp
l2tp: ensure sk->dst is still valid
2011-11-26 15:57:36 -05:00
lapb
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
llc
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-16 02:11:14 -05:00
netfilter
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
netlabel
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
netlink
genetlink: Add lockdep_genl_is_held().
2011-12-03 09:35:07 -08:00
netrom
NET: NETROM: Fix formatting.
2011-11-29 00:23:13 -05:00
nfc
nfc: Remove function tracer like entry messages
2011-11-30 15:08:38 -05:00
openvswitch
openvswitch: small potential memory leak in ovs_vport_alloc()
2011-12-06 12:58:57 -05:00
packet
packet: Add needed_tailroom to packet_sendmsg_spkt
2011-11-18 14:37:10 -05:00
phonet
Phonet: set the pipe handle using setsockopt
2011-11-18 14:37:40 -05:00
rds
rds: drop "select LLIST"
2011-11-14 00:10:50 -05:00
rfkill
net: rfkill: convert net/rfkill/* to use module_platform_driver()
2011-11-30 15:08:27 -05:00
rose
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
rxrpc
RxRPC: Use kmemdup rather than duplicating its implementation
2011-11-21 15:02:36 -05:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-16 02:11:14 -05:00
sctp
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
sunrpc
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
tipc
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
unix
unix_diag: Write it into kbuild
2011-12-16 13:48:29 -05:00
wanrouter
wanrouter: Remove kernel_lock annotations
2011-11-07 13:27:30 -05:00
wimax
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
wireless
wireless: disable wext sysfs by default
2011-12-07 15:19:39 -05:00
x25
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
xfrm
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
compat.c
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
Kconfig
net: Add Open vSwitch kernel components.
2011-12-03 09:35:17 -08:00
Makefile
net: Add Open vSwitch kernel components.
2011-12-03 09:35:17 -08:00
nonet.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
socket.c
net: add network priority cgroup infrastructure (v4)
2011-11-22 15:22:23 -05:00
sysctl_net.c
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00