summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-03-2911-83/+59
|\
| * sunrpc: skip portmap calls on sessions backchannelJ. Bruce Fields2012-03-261-0/+1
| * sunrpc: create nfsd dir in rpc_pipefsJeff Layton2012-03-261-0/+5
| * Merge nfs containerization work from Trond's treeJ. Bruce Fields2012-03-2628-733/+1559
| |\
| * | svcrdma: Cleanup sparse warnings in the svcrdma moduleTom Tucker2012-02-176-80/+50
| * | SUNPRC: remove marking service temporary sockets with XPT_CHNGBUFStanislav Kinsbursky2012-02-031-2/+0
| * | nfsd: remove some unneeded checksDan Carpenter2012-02-031-1/+1
| * | nfsd: don't allow zero length strings in cache_parse()Dan Carpenter2012-02-031-0/+2
* | | Merge tag 'nfs-for-3.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-03-281-1/+1
|\ \ \
| * | | SUNRPC: Use the already looked-up xprt in rpcb_getport_async()Bryan Schumaker2012-03-271-1/+1
* | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2893-93/+0
|\ \ \ \
| * | | | Remove all #inclusions of asm/system.hDavid Howells2012-03-2893-93/+0
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-03-283-230/+255
|\ \ \ \ \
| * | | | | libceph: isolate kmap() call in write_partial_msg_pages()Alex Elder2012-03-221-11/+2
| * | | | | libceph: rename "page_shift" variable to something sensibleAlex Elder2012-03-221-5/+6
| * | | | | libceph: get rid of zero_page_addressAlex Elder2012-03-221-9/+2
| * | | | | libceph: only call kernel_sendpage() via helperAlex Elder2012-03-221-6/+2
| * | | | | libceph: use kernel_sendpage() for sending zeroesAlex Elder2012-03-221-5/+15
| * | | | | libceph: fix inverted crc option logicAlex Elder2012-03-221-10/+10
| * | | | | libceph: some simple changesAlex Elder2012-03-221-4/+9
| * | | | | libceph: small refactor in write_partial_kvec()Alex Elder2012-03-221-11/+12
| * | | | | libceph: do crc calculations outside loopAlex Elder2012-03-221-14/+12
| * | | | | libceph: separate CRC calculation from byte swappingAlex Elder2012-03-221-14/+17
| * | | | | libceph: use "do" in CRC-related Boolean variablesAlex Elder2012-03-221-20/+20
| * | | | | ceph: ensure Boolean options support both sensesAlex Elder2012-03-221-0/+10
| * | | | | libceph: a few small changesAlex Elder2012-03-221-14/+18
| * | | | | libceph: make ceph_tcp_connect() return intAlex Elder2012-03-221-8/+6
| * | | | | libceph: encapsulate some messenger cleanup codeAlex Elder2012-03-221-18/+20
| * | | | | libceph: make ceph_msgr_wq privateAlex Elder2012-03-221-1/+1
| * | | | | libceph: encapsulate connection kvec operationsAlex Elder2012-03-221-61/+56
| * | | | | libceph: move prepare_write_banner()Alex Elder2012-03-221-3/+4
| * | | | | rbd: make ceph_parse_options() return a pointerAlex Elder2012-03-221-8/+8
| * | | | | ceph: eliminate some abusive castsAlex Elder2012-03-221-4/+4
| * | | | | ceph: eliminate some needless castsAlex Elder2012-03-221-11/+10
| * | | | | ceph: kill addr_str_lock spinlock; use atomic insteadAlex Elder2012-03-221-11/+10
| * | | | | ceph: make use of "else" where appropriateAlex Elder2012-03-221-7/+4
| * | | | | ceph: use a shared zero page rather than one per messengerAlex Elder2012-03-221-14/+29
| * | | | | libceph: fix overflow check in crush_decode()Xi Wang2012-03-221-1/+2
| * | | | | net/ceph: Only clear SOCK_NOSPACE when there is sufficient space in the socke...Jim Schutt2012-03-221-6/+12
* | | | | | Merge tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2012-03-281-3/+23
|\ \ \ \ \ \
| * | | | | | net/9p: handle flushed Tclunk/TremoveJim Garlick2012-02-261-3/+15
| * | | | | | net/9p: don't allow Tflush to be interruptedJim Garlick2012-02-261-0/+8
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-03-277-57/+103
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()Eric Dumazet2012-03-271-2/+6
| * | | | | | net: add a truesize parameter to skb_add_rx_frag()Eric Dumazet2012-03-251-2/+2
| * | | | | | Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-03-235-53/+95
| |\ \ \ \ \ \
| | * | | | | | netfilter: nf_conntrack: permanently attach timeout policy to conntrackPablo Neira Ayuso2012-03-231-17/+22
| | * | | | | | netfilter: xt_CT: fix assignation of the generic protocol trackerPablo Neira Ayuso2012-03-231-1/+8
| | * | | | | | netfilter: xt_CT: missing rcu_read_lock section in timeout assignmentPablo Neira Ayuso2012-03-231-6/+12
| | * | | | | | netfilter: cttimeout: fix dependency with l4protocol conntrack modulePablo Neira Ayuso2012-03-233-24/+48