mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-17 09:33:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
cf2acec2e90beffc20c8a63322f0a978ea4941df
linux/net
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
9p
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
802
tokenring: delete all remaining driver support
2012-05-15 20:23:16 -04:00
8021q
vlan: add helper which can be called to see if device is used by vlan
2012-08-24 13:46:39 -04:00
appletalk
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
atm
net🏧fix up ENOIOCTLCMD error handling
2012-08-31 16:14:33 -04:00
ax25
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
bridge
netdev: make address const in device address management
2012-09-19 16:35:22 -04:00
caif
caif: move the dereference below the NULL test
2012-09-10 16:13:31 -04:00
can
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
ceph
libceph: only kunmap kmapped pages
2012-09-21 20:49:26 -07:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
dcb
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
dccp
dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)
2012-08-15 21:36:31 -07:00
decnet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
dns_resolver
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
dsa
dsa: Convert compare_ether_addr to ether_addr_equal
2012-05-09 20:49:19 -04:00
ethernet
ipx: move peII functions
2012-07-19 10:48:00 -07:00
ieee802154
net/ieee802154/6lowpan.c: Remove unecessary semicolon
2012-09-18 16:08:19 -04:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
ipx
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
irda
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
iucv
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
key
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
lapb
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
llc
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
mac802154
mac802154: sparse warnings: make symbols static
2012-07-12 07:54:45 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
netlabel
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netlink
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netrom
net: change return values from -EACCES to -EPERM
2012-09-21 13:58:08 -04:00
nfc
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
openvswitch
net/openvswitch/vport.c: Remove unecessary semicolon
2012-09-18 16:08:19 -04:00
packet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
phonet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
rds
rds: Don't disable BH on BH context
2012-08-22 22:52:04 -07:00
rfkill
Revert "rfkill: remove dead code"
2012-08-21 20:50:25 +02:00
rose
net: Convert all sysctl registrations to register_net_sysctl
2012-04-20 21:22:30 -04:00
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-10 23:56:33 -07:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
sunrpc
Merge tag 'nfs-for-3.6-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
2012-09-13 09:04:13 +08:00
tipc
net/tipc/name_table.c: Remove unecessary semicolon
2012-09-18 16:08:19 -04:00
unix
af_unix: old_cred is surplus
2012-09-17 13:00:13 -04:00
wanrouter
wanmain: comparing array with NULL
2012-07-24 13:55:21 -07:00
wimax
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
x25
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
compat.c
net: Fix references to out-of-scope variables in put_cmsg_compat()
2012-07-22 17:50:49 -07:00
Kconfig
net: Add INET dependency on aes crypto for the sake of TCP fastopen.
2012-09-04 14:20:14 -04:00
Makefile
econet: remove ancient bug ridden protocol
2012-05-18 01:35:08 -04:00
nonet.c
…
socket.c
net: remove sk_init() helper
2012-09-27 18:42:00 -04:00
sysctl_net.c
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00