summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-3116-60/+304
|\
| * nfs: enable swap on NFSMel Gorman2012-07-314-2/+62
| * netvm: prevent a stream-specific deadlockMel Gorman2012-07-314-13/+27
| * netvm: set PF_MEMALLOC as appropriate during SKB processingMel Gorman2012-07-312-6/+63
| * netvm: allow skb allocation to use PFMEMALLOC reservesMel Gorman2012-07-313-25/+112
| * netvm: allow the use of __GFP_MEMALLOC by specific socketsMel Gorman2012-07-311-0/+22
| * net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on th...Mel Gorman2012-07-312-8/+12
| * memcg: rename config variablesAndrew Morton2012-07-315-6/+6
* | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-312-0/+4
|\ \
| * | net: feed /dev/random with the MAC address when registering a deviceTheodore Ts'o2012-07-142-0/+4
* | | Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-07-314-5/+19
|\ \ \
| * | | SUNRPC: return negative value in case rpcbind client creation errorStanislav Kinsbursky2012-07-301-2/+2
| * | | nfs: skip commit in releasepage if we're freeing memory for fs-related reasonsJeff Layton2012-07-303-1/+14
| * | | sunrpc: clarify comments on rpc_make_runnableJeff Layton2012-07-301-2/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-3114-119/+216
|\ \ \ \
| * | | | ipv4: Properly purge netdev references on uncached routes.David S. Miller2012-07-313-4/+66
| * | | | ipv4: Cache routes in nexthop exception entries.David S. Miller2012-07-312-64/+78
| * | | | ipv4: percpu nh_rth_output cacheEric Dumazet2012-07-312-6/+32
| * | | | ipv4: Restore old dst_free() behavior.Eric Dumazet2012-07-314-40/+39
| * | | | bridge: make port attributes conststephen hemminger2012-07-301-3/+3
| * | | | ipv4: remove rt_cache_rebuild_countEric Dumazet2012-07-301-11/+0
| * | | | net: ipv4: fix RCU races on dst refcountsEric Dumazet2012-07-307-29/+41
| * | | | net: TCP early demux cleanupEric Dumazet2012-07-302-4/+0
| * | | | ipv6: fix incorrect route 'expires' value passed to userspaceLi Wei2012-07-292-8/+8
| * | | | ipv4: clean up put_childLin Ming2012-07-291-26/+25
| * | | | ipv4: fix debug info in tnode_newLin Ming2012-07-291-1/+1
* | | | | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-07-311-1/+4
|\ \ \ \ \
| * | | | | SUNRPC/cache: fix reporting of expired cache entries in 'content' file.NeilBrown2012-07-121-1/+4
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-07-317-445/+737
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | libceph: recheck con state after allocating incoming messageSage Weil2012-07-301-1/+8
| * | | | | libceph: change ceph_con_in_msg_alloc convention to be less weirdSage Weil2012-07-301-25/+31
| * | | | | libceph: avoid dropping con mutex before faultSage Weil2012-07-301-3/+1
| * | | | | libceph: verify state after retaking con lock after dispatchSage Weil2012-07-301-1/+2
| * | | | | libceph: revoke mon_client messages on session restartSage Weil2012-07-301-0/+4
| * | | | | libceph: fix handling of immediate socket connect failureSage Weil2012-07-301-7/+19
| * | | | | libceph: be less chatty about stray repliesSage Weil2012-07-301-2/+2
| * | | | | libceph: clear all flags on con_closeSage Weil2012-07-301-0/+2
| * | | | | libceph: clean up con flagsSage Weil2012-07-301-26/+36
| * | | | | libceph: replace connection state bits with statesSage Weil2012-07-301-62/+68
| * | | | | libceph: drop unnecessary CLOSED check in socket state change callbackSage Weil2012-07-301-3/+0
| * | | | | libceph: close socket directly from ceph_con_close()Sage Weil2012-07-301-7/+1
| * | | | | libceph: drop gratuitous socket close calls in con_workSage Weil2012-07-301-4/+4
| * | | | | libceph: move ceph_con_send() closed check under the con mutexSage Weil2012-07-301-9/+7
| * | | | | libceph: move msgr clear_standby under con mutex protectionSage Weil2012-07-301-3/+4
| * | | | | libceph: fix fault locking; close socket on lossy faultSage Weil2012-07-301-7/+7
| * | | | | libceph: trivial fix for the incorrect debug outputJiaju Zhang2012-07-301-1/+1
| * | | | | libceph: reset connection retry on successfully negotiationSage Weil2012-07-301-0/+2
| * | | | | libceph: protect ceph_con_open() with mutexSage Weil2012-07-301-0/+2
| * | | | | libceph: (re)initialize bio_iter on start of message receiveSage Weil2012-07-301-5/+6
| * | | | | libceph: resubmit linger ops when pg mapping changesSage Weil2012-07-301-5/+21