summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-01-1511-30/+59
|\
| * bridge: fix lockdep addr_list_lock false positive splatNikolay Aleksandrov2016-01-151-0/+8
| * net: sctp: Move sequence start handling into sctp_transport_get_idx()Geert Uytterhoeven2016-01-151-3/+3
| * ipv6: update skb->csum when CE mark is propagatedEric Dumazet2016-01-151-1/+1
| * sctp: support to lookup with ep+paddr in transport rhashtableXin Long2016-01-151-15/+23
| * net: preserve IP control block during GSO segmentationKonstantin Khlebnikov2016-01-154-4/+9
| * Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2016-01-132-6/+14
| |\
| | * batman-adv: Fix list removal of batadv_hardif_neigh_nodeSven Eckelmann2016-01-131-6/+12
| | * batman-adv: fix lockdep splat when doing mcast_freeSimon Wunderlich2016-01-131-0/+2
| * | genetlink: Fix off-by-one in genl_allocate_reserve_groups()David S. Miller2016-01-131-1/+1
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxDavid S. Miller2016-01-13267-6628/+11042
| |\
| * | net: netlink: Fix multicast group storage allocation for families with more t...Matti Vaittinen2016-01-121-1/+1
| * | net: bpf: reject invalid shiftsRabin Vincent2016-01-121-0/+5
* | | Merge tag 'nfsd-4.5' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2016-01-154-8/+50
|\ \ \
| * | | Revert "svcrdma: Do not send XDR roundup bytes for a write chunk"J. Bruce Fields2016-01-071-7/+0
| * | | sunrpc: Add a function to close temporary transports immediatelyScott Mayhew2015-12-231-0/+45
| * | | nfsd4: fix gss-proxy 4.1 mounts for some AD principalsJ. Bruce Fields2015-11-241-0/+3
| * | | svcrpc: move some initialization to common codeJ. Bruce Fields2015-11-242-8/+2
| * | | svcrdma: Do not send XDR roundup bytes for a write chunkChuck Lever2015-11-231-0/+7
* | | | 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
OpenPOWER on IntegriCloud