summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-08-1416-149/+98Star
|\
| * net: Always untag vlan-tagged traffic on input.Vlad Yasevich2014-08-114-55/+55
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-08-116-86/+39Star
| |\
| | * netfilter: nf_tables: fix error return codeJulia Lawall2014-08-081-1/+3
| | * netfilter: don't use mutex_lock_interruptible()Pablo Neira Ayuso2014-08-085-73/+22Star
| | * netfilter: nf_tables: don't update chain with unset countersPablo Neira Ayuso2014-08-081-0/+3
| | * netfilter: nf_tables: uninitialize element key/data from the commit pathPablo Neira Ayuso2014-08-081-12/+11Star
| * | rtnetlink: fix VF info sizeJiri Benc2014-08-081-1/+2
| * | ipv4: removed redundant conditionalNiv Yehezkel2014-08-081-2/+0Star
| * | netlink: reset network header before passing to tapsDaniel Borkmann2014-08-081-1/+1
| * | batman: fix duplicate #include of multicast.hJean Sacren2014-08-081-1/+0Star
| * | openvswitch: fix duplicate #include headersJean Sacren2014-08-081-2/+0Star
| * | 6lowpan: Allow 6LoWPAN to be modularGeert Uytterhoeven2014-08-071-1/+1
| |/
* | Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-08-1416-383/+809
|\ \
| * | SUNRPC: remove all refcounting of groupinfo from rpcauth_lookupcredNeilBrown2014-08-041-7/+1Star
| * | sunrpc/auth: allow lockless (rcu) lookup of credential cache.NeilBrown2014-08-033-2/+23
| * | sunrpc: remove "ec" argument from encrypt_v2 operationJeff Layton2014-08-032-8/+3Star
| * | sunrpc: clean up sparse endianness warnings in gss_krb5_wrap.cJeff Layton2014-08-031-7/+13
| * | sunrpc: clean up sparse endianness warnings in gss_krb5_seal.cJeff Layton2014-08-031-11/+17
| * | sunrpc: fix RCU handling of gc_ctx fieldJeff Layton2014-08-031-17/+35
| * | Merge branch 'nfs-rdma' of git://git.linux-nfs.org/projects/anna/nfs-rdma int...Trond Myklebust2014-08-0354-701/+1065
| |\ \
| | * | xprtrdma: Handle additional connection eventsChuck Lever2014-07-311-11/+14
| | * | xprtrdma: Remove RPCRDMA_PERSISTENT_REGISTRATION macroChuck Lever2014-07-311-13/+0Star
| | * | xprtrdma: Make rpcrdma_ep_disconnect() return voidChuck Lever2014-07-313-12/+6Star
| | * | xprtrdma: Schedule reply tasklet once per upcallChuck Lever2014-07-311-16/+15Star
| | * | xprtrdma: Allocate each struct rpcrdma_mw separatelyChuck Lever2014-07-311-99/+143
| | * | xprtrdma: Rename frmr_wrChuck Lever2014-07-311-13/+13
| | * | xprtrdma: Disable completions for LOCAL_INV Work RequestsChuck Lever2014-07-311-9/+8Star
| | * | xprtrdma: Disable completions for FAST_REG_MR Work RequestsChuck Lever2014-07-311-5/+4Star
| | * | xprtrdma: Don't post a LOCAL_INV in rpcrdma_register_frmr_external()Chuck Lever2014-07-311-20/+2Star
| | * | xprtrdma: Reset FRMRs after a flushed LOCAL_INV Work RequestChuck Lever2014-07-311-2/+92
| | * | xprtrdma: Reset FRMRs when FAST_REG_MR is flushed by a disconnectChuck Lever2014-07-312-2/+66
| | * | xprtrdma: Properly handle exhaustion of the rb_mws listChuck Lever2014-07-311-32/+71
| | * | xprtrdma: Chain together all MWs in same buffer poolChuck Lever2014-07-312-1/+7
| | * | xprtrdma: Back off rkey when FAST_REG_MR failsChuck Lever2014-07-311-0/+1
| | * | xprtrdma: Unclutter struct rpcrdma_mr_segChuck Lever2014-07-312-28/+50
| | * | xprtrdma: Don't invalidate FRMRs if registration failsChuck Lever2014-07-311-3/+5
| | * | xprtrdma: On disconnect, don't ignore pending CQEsChuck Lever2014-07-311-5/+9
| | * | xprtrdma: Update rkeys after transport reconnectChuck Lever2014-07-313-42/+54
| | * | xprtrdma: Limit data payload size for ALLPHYSICALChuck Lever2014-07-313-1/+45
| | * | xprtrdma: Protect ia->ri_id when unmapping/invalidating MRsChuck Lever2014-07-312-6/+18
| | * | xprtrdma: Fix panic in rpcrdma_register_frmr_external()Chuck Lever2014-07-311-5/+7
| | * | xprtrdma: Fix DMA-API-DEBUG warning by checking dma_map resultYan Burman2014-07-221-0/+3
| * | | SUNRPC: Enforce an upper limit on the number of cached credentialsTrond Myklebust2014-08-031-9/+35
| * | | replace strict_strto callsDaniel Walter2014-07-133-13/+9Star
| * | | rpc_pipe: Drop memory allocation castHimangi Saraogi2014-07-131-1/+1
| * | | sunrpc: add a new "stringify_acceptor" rpc_credopJeff Layton2014-07-132-20/+51
| * | | auth_gss: fetch the acceptor name out of the downcallJeff Layton2014-07-131-3/+17
| * | | SUNRPC: Handle EPIPE in xprt_connect_statusTrond Myklebust2014-07-032-0/+2
| * | | SUNRPC: Ensure that we handle ENOBUFS errors correctly.Trond Myklebust2014-06-302-0/+9