Linus Torvalds
8d9ea7172e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"A pile of fixes in response to yesterday's big merge. The SCTP HMAC
thing hasn't been addressed yet, I'll take care of that myself if Neil
and Vlad don't show signs of life by tomorrow.
1) Use after free of SKB in tuntap code. Fix by Eric Dumazet,
reported by Dave Jones.
2) NFC LLCP code emits annoying kernel log message, triggerable by
the user. From Dave Jones.
3) Fix several endianness bugs noticed by sparse in the bridging
code, from Stephen Hemminger.
4) Ipv6 NDISC code doesn't take padding into account properly, fix
from YOSHIFUJI Hideaki.
5) Add missing docs to ethtool_flow_ext struct, from Yan Burman."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
bridge: fix icmpv6 endian bug and other sparse warnings
net: ethool: Document struct ethtool_flow_ext
ndisc: Fix padding error in link-layer address option.
tuntap: dont use skb after netif_rx_ni(skb)
nfc: remove noisy message from llcp_sock_sendmsg
2012-12-13 13:20:02 -08:00
The following changes since commit 4cbe5a555f:
2012-10-12 09:59:23 +09:00
8021q: fix vlan device to inherit the unicast filtering capability flag
2012-11-30 12:07:27 -05:00
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
pppoatm: optimise PPP channel wakeups after sock_owned_by_user()
2012-12-02 00:05:20 +00:00
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
batman-adv: use ETH_P_BATMAN
2012-11-30 10:50:22 +01:00
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: fix icmpv6 endian bug and other sparse warnings
2012-12-13 12:58:11 -05:00
caif_usb: Make the driver name check more efficient
2012-12-09 00:34:02 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
net: Allow DCBnl to use other namespaces besides init_net
2012-12-10 14:09:01 -05:00
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
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: Hide core config options; make drivers select what they need
2012-11-26 17:10:44 -05:00
ipx: move peII functions
2012-07-19 10:48:00 -07:00
6lowpan: consider checksum bytes in fragmentation threshold
2012-11-30 12:19:24 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
ndisc: Fix padding error in link-layer address option.
2012-12-13 12:58:11 -05:00
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
TTY/Serial merge for 3.8-rc1
2012-12-11 14:08:47 -08:00
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-10 18:32:51 -05:00
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
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: use kfree_skb() instead of dev_kfree_skb()
2012-11-30 12:19:24 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
net: change return values from -EACCES to -EPERM
2012-09-21 13:58:08 -04:00
nfc: remove noisy message from llcp_sock_sendmsg
2012-12-13 12:58:10 -05:00
openvswitch: Use RCU callback when detaching netdevices.
2012-11-28 14:04:34 -08:00
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
2012-11-18 20:32:45 -05:00
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
2012-11-18 20:32:44 -05:00
net: rds: use this_cpu_* per-cpu helper
2012-11-19 18:59:44 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-14 13:39:34 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
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: return proper errno from backchannel_rqst
2012-11-01 11:50:53 -04:00
tipc: refactor accept() code for improved readability
2012-12-07 17:23:24 -05:00
net: Don't export sysctls to unprivileged users
2012-11-18 20:30:55 -05:00
wanmain: comparing array with NULL
2012-07-24 13:55:21 -07:00
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
2012-12-11 16:04:03 -05:00
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2012-11-22 15:25:55 -05:00
make get_file() return its argument
2012-09-26 21:10:25 -04:00
net: Add INET dependency on aes crypto for the sake of TCP fastopen.
2012-09-04 14:20:14 -04:00
ipv6: Preserve ipv6 functionality needed by NET
2012-11-18 02:34:00 -05:00
cgroup: net_cls: Rework update socket logic
2012-10-26 03:40:51 -04:00
user_ns: get rid of duplicate code in net_ctl_permissions
2012-11-18 20:32:45 -05:00
8d9ea7172e