iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
9p
The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:
2012-10-12 09:59:23 +09:00
802
…
8021q
net: Allow the userns root to control vlans.
2012-11-18 20:33:00 -05: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
batman-adv: Use packing of 2 for all headers before an ethernet header
2012-11-21 12:35:47 +01:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-17 22:00:43 -05:00
bridge
net: Enable a userns root rtnl calls that are safe for unprivilged users
2012-11-18 20:33:36 -05:00
caif
caif: Remove redundant null check before kfree in cfctrl.c
2012-11-20 13:48:09 -05:00
can
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-10-29 08:49:25 -07:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-25 12:49:17 -05:00
dcb
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
dccp
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
decnet
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
dns_resolver
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-14 13:39:34 -07:00
dsa
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07: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-11-25 12:49:17 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-25 12:49:17 -05:00
ipx
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
irda
Merge 3.7-rc1 into tty-linus
2012-10-14 22:41:27 -07:00
iucv
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
key
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-10 18:32:51 -05:00
lapb
…
llc
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-25 12:49:17 -05: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-11-25 12:49:17 -05:00
netlabel
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
netlink
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
netrom
net: change return values from -EACCES to -EPERM
2012-09-21 13:58:08 -04:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-25 12:49:17 -05:00
openvswitch
net/openvswitch/vport.c: Remove unecessary semicolon
2012-09-18 16:08:19 -04:00
packet
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
phonet
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
rds
net: rds: use this_cpu_* per-cpu helper
2012-11-19 18:59:44 -05:00
rfkill
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
rose
…
rxrpc
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-14 13:39:34 -07:00
sched
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
sctp
sctp: send abort chunk when max_retrans exceeded
2012-11-20 15:50:37 -05:00
sunrpc
SUNRPC: return proper errno from backchannel_rqst
2012-11-01 11:50:53 -04:00
tipc
tipc: delete TIPC_ADVANCED Kconfig variable
2012-11-22 14:33:29 -05:00
unix
net: Don't export sysctls to unprivileged users
2012-11-18 20:30:55 -05:00
wanrouter
wanmain: comparing array with NULL
2012-07-24 13:55:21 -07:00
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-17 22:00:43 -05:00
x25
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2012-11-22 15:25:55 -05:00
compat.c
make get_file() return its argument
2012-09-26 21:10:25 -04:00
Kconfig
net: Add INET dependency on aes crypto for the sake of TCP fastopen.
2012-09-04 14:20:14 -04:00
Makefile
ipv6: Preserve ipv6 functionality needed by NET
2012-11-18 02:34:00 -05:00
nonet.c
…
socket.c
cgroup: net_cls: Rework update socket logic
2012-10-26 03:40:51 -04:00
sysctl_net.c
user_ns: get rid of duplicate code in net_ctl_permissions
2012-11-18 20:32:45 -05:00