Linus Torvalds a2faf2fc53 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ... Pull (again) user namespace infrastructure changes from Eric Biederman: "Those bugs, those darn embarrasing bugs just want don't want to get fixed. Linus I just updated my mirror of your kernel.org tree and it appears you successfully pulled everything except the last 4 commits that fix those embarrasing bugs. When you get a chance can you please repull my branch" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: userns: Fix typo in description of the limitation of userns_install userns: Add a more complete capability subset test to commit_creds userns: Require CAP_SYS_ADMIN for most uses of setns. Fix cap_capable to only allow owners in the parent user namespace to have caps.		2012-12-18 10:55:28 -08:00
..
9p	The following changes since commit 4cbe5a555f:	2012-10-12 09:59:23 +09:00
802
8021q	8021q: fix vlan device to inherit the unicast filtering capability flag	2012-11-30 12:07:27 -05:00
appletalk	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
atm	pppoatm: optimise PPP channel wakeups after sock_owned_by_user()	2012-12-02 00:05:20 +00: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 ETH_P_BATMAN	2012-11-30 10:50:22 +01:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-12-13 12:00:48 -08:00
bridge	bridge: fix icmpv6 endian bug and other sparse warnings	2012-12-13 12:58:11 -05:00
caif	caif_usb: Make the driver name check more efficient	2012-12-09 00:34:02 -05:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08: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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-12-18 10:55:28 -08:00
dcb	net: Allow DCBnl to use other namespaces besides init_net	2012-12-10 14:09:01 -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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
dsa	dsa: Hide core config options; make drivers select what they need	2012-11-26 17:10:44 -05:00
ethernet	ipx: move peII functions	2012-07-19 10:48:00 -07:00
ieee802154	6lowpan: consider checksum bytes in fragmentation threshold	2012-11-30 12:19:24 -05:00
ipv4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
ipv6	ndisc: Fix padding error in link-layer address option.	2012-12-13 12:58:11 -05:00
ipx	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
irda	TTY/Serial merge for 3.8-rc1	2012-12-11 14:08:47 -08: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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
mac802154	mac802154: use kfree_skb() instead of dev_kfree_skb()	2012-11-30 12:19:24 -05:00
netfilter	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08: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	nfc: remove noisy message from llcp_sock_sendmsg	2012-12-13 12:58:10 -05:00
openvswitch	openvswitch: Use RCU callback when detaching netdevices.	2012-11-28 14:04:34 -08: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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-12-12 18:07:07 -08:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
sunrpc	SUNRPC: continue run over clients list on PipeFS event instead of break	2012-12-17 12:19:16 -05:00
tipc	tipc: refactor accept() code for improved readability	2012-12-07 17:23:24 -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 branch 'for-john' of git://git.sipsolutions.net/mac80211-next	2012-12-11 16:04:03 -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