summaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-07 06:06:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-07 06:06:02 +0200
commit6456a0438b984186a0c9c8ecc9fe3d97b7ac3613 (patch)
tree51e61c1c269cd3647b73d6cf5d2168167f9fb0a6 /mm/memcontrol.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
parentnetlink: hold nl_sock_hash_lock during diag dump (diff)
downloadlinux-6456a0438b984186a0c9c8ecc9fe3d97b7ac3613.tar.xz
linux-6456a0438b984186a0c9c8ecc9fe3d97b7ac3613.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: "This fixes the most immediate fallout from yesterday's networking merge: 1) sock_tx_timestamp() must not clear the passed in tx_flags, but rather add to them. Fix from Eric Dumazet. 2) The hyperv driver sendbuf region increase needs to be decreased slightly to handle older backends. From KY Srinivasan. 3) Fix RCU lockdep splats in netlink diag after recent hashing changes, from Thomas Graf. 4) The new IPV6_FLOWLABEL was given a socket option number that overlapped with an existing IP6 tables one, breaking ip6_tables. Fixed by Pablo Neira Ayuso" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: netlink: hold nl_sock_hash_lock during diag dump tcp: md5: check md5 signature without socket lock net: fix USB network driver config option. net: reallocate new socket option number for IPV6_AUTOFLOWLABEL vmxnet3: fix decimal printf format specifiers prefixed with 0x net-timestamp: cumulative tcp timestamping fixes hyperv: Adjust the size of sendbuf region to support ws2008r2 cxgb4: Fix for SR-IOV VF initialization net-timestamp: sock_tx_timestamp() fix
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions