summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew)Linus Torvalds2016-01-158-136/+59
|\
| * mm: memcontrol: switch to the updated jump-label APIJohannes Weiner2016-01-141-2/+2
| * mm: memcontrol: generalize the socket accounting jump labelJohannes Weiner2016-01-142-7/+2
| * net: tcp_memcontrol: simplify linkage between socket and page counterJohannes Weiner2016-01-145-97/+36
| * net: tcp_memcontrol: sanitize tcp memory accounting callbacksJohannes Weiner2016-01-142-12/+21
| * net: tcp_memcontrol: simplify the per-memcg limit accessJohannes Weiner2016-01-141-8/+0
| * net: tcp_memcontrol: remove dead per-memcg count of allocated socketsJohannes Weiner2016-01-141-3/+0
| * net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-labelJohannes Weiner2016-01-143-9/+7
| * memcg: do not allow to disable tcp accounting after limit is setVladimir Davydov2016-01-141-12/+5
| * kmemcg: account certain kmem allocations to memcgVladimir Davydov2016-01-142-2/+2
* | Merge tag 'nfs-for-4.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2016-01-1410-92/+298
|\ \ | |/ |/|
| * Merge branch 'bugfixes'Trond Myklebust2016-01-072-28/+22
| |\
| | * SUNRPC: Fixup socket wait for memoryTrond Myklebust2016-01-061-28/+21
| | * SUNRPC: Fix a missing break in rpc_anyaddr()Trond Myklebust2015-12-301-0/+1
| * | Merge tag 'nfs-rdma-4.5' of git://git.linux-nfs.org/projects/anna/nfs-rdmaTrond Myklebust2015-12-288-51/+275
| |\ \
| | * | xprtrdma: Revert commit e7104a2a9606 ('xprtrdma: Cap req_cqinit').Chuck Lever2015-12-182-10/+2
| | * | xprtrdma: Invalidate in the RPC reply handlerChuck Lever2015-12-181-0/+16
| | * | xprtrdma: Add ro_unmap_sync method for all-physical registrationChuck Lever2015-12-181-0/+13
| | * | xprtrdma: Add ro_unmap_sync method for FMRChuck Lever2015-12-181-0/+64
| | * | xprtrdma: Add ro_unmap_sync method for FRWRChuck Lever2015-12-182-4/+134
| | * | xprtrdma: Introduce ro_unmap_sync methodChuck Lever2015-12-181-0/+2
| | * | xprtrdma: Move struct ib_send_wr off the stackChuck Lever2015-12-182-18/+24
| | * | xprtrdma: Disable RPC/RDMA backchannel debugging messagesChuck Lever2015-12-181-7/+9
| | * | xprtrdma: xprt_rdma_free() must not release backchannel reqsChuck Lever2015-12-181-0/+3
| | * | xprtrdma: Fix additional uses of spin_lock_irqsave(rb_lock)Chuck Lever2015-12-182-9/+4
| | * | xprtrdma: checking for NULL instead of IS_ERR()Dan Carpenter2015-12-181-2/+2
| | * | xprtrdma: clean up some curly bracesDan Carpenter2015-12-181-1/+2
| * | | SUNRPC: drop unused xs_reclassify_socketX() helpersStefan Hajnoczi2015-12-281-13/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2016-01-12270-6640/+11102
|\ \ \
| * | | net: bpf: reject invalid shiftsRabin Vincent2016-01-121-0/+5
| * | | phonet: properly unshare skbs in phonet_rcv()Eric Dumazet2016-01-121-0/+4
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-01-1114-40/+67
| |\ \ \
| | * | | udp: disallow UFO for sockets with SO_NO_CHECK optionMichal Kubeček2016-01-112-2/+2
| | * | | net: pktgen: fix null ptr deref in skb allocationJohn Fastabend2016-01-111-1/+3
| | * | | sched,cls_flower: set key address type when presentJamal Hadi Salim2016-01-111-2/+8
| | * | | tcp_yeah: don't set ssthresh below 2Neal Cardwell2016-01-111-1/+1
| | * | | sctp: fix use-after-free in pr_debug statementMarcelo Ricardo Leitner2016-01-112-18/+10
| | * | | unix: properly account for FDs passed over unix socketswilly tarreau2016-01-112-9/+28
| | * | | ipv6: tcp: add rcu locking in tcp_v6_send_synack()Eric Dumazet2016-01-101-0/+2
| | * | | net: sctp: prevent writes to cookie_hmac_alg from accessing invalid memorySasha Levin2016-01-101-1/+1
| | * | | udp: restrict offloads to one namespaceHannes Frederic Sowa2016-01-102-4/+8
| | * | | batman-adv: Fix invalid read while copying bat_iv.bcast_ownSven Eckelmann2016-01-071-2/+4
| * | | | bpf: support ipv6 for bpf_skb_{set,get}_tunnel_keyDaniel Borkmann2016-01-111-7/+62
| * | | | bpf: export helper function flags and reject invalid onesDaniel Borkmann2016-01-111-14/+23
| * | | | net/rtnetlink: remove unused sz_idx variableAlexander Kuleshov2016-01-111-2/+1
| * | | | openvswitch: update kernel doc for struct vportJean Sacren2016-01-101-1/+2
| * | | | openvswitch: fix struct geneve_port member nameJean Sacren2016-01-101-3/+3
| * | | | openvswitch: clean up unused functionJean Sacren2016-01-101-20/+0
| * | | | net: add scheduling point in recvmmsg/sendmmsgEric Dumazet2016-01-101-0/+2
| * | | | ipv6: always add flag an address that failed DAD with DADFAILEDLubomir Rintel2016-01-101-2/+3
OpenPOWER on IntegriCloud