summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-01-2910-18/+44
|\
| * net: Fix warning on make htmldocs caused by skbuff.cMasanari Iida2014-01-281-1/+1
| * Merge tag 'rxrpc-20140126' of git://git.kernel.org/pub/scm/linux/kernel/git/d...David S. Miller2014-01-282-1/+8
| |\
| | * af_rxrpc: Handle frames delivered from another VMTim Smith2014-01-261-1/+2
| | * af_rxrpc: Avoid setting up double-free on checksum errorTim Smith2014-01-261-0/+4
| | * RxRPC: do not unlock unheld spinlock in rxrpc_connect_exclusive()Alexey Khoroshilov2014-01-261-0/+2
| * | llc: remove noisy WARN from llc_mac_hdr_initDave Jones2014-01-281-1/+1
| * | net: gre: use icmp_hdr() to get inner ip headerDuan Jiong2014-01-271-1/+1
| * | net: 6lowpan: fixup for code movementStephen Rothwell2014-01-271-1/+1
| * | net: Fix memory leak if TPROXY used with TCP early demuxHolger Eitzenberger2014-01-272-2/+2
| * | net: ipv4: Use PTR_ERR_OR_ZEROSachin Kamat2014-01-271-1/+2
| * | net: add and use skb_gso_transport_seglen()Florian Westphal2014-01-262-10/+28
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-01-289-157/+636
|\ \ \
| * | | libceph: follow redirect replies from osdsIlya Dryomov2014-01-271-9/+158
| * | | libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}Ilya Dryomov2014-01-272-17/+17
| * | | libceph: follow {read,write}_tier fields on osd request submissionIlya Dryomov2014-01-272-5/+53
| * | | libceph: add ceph_pg_pool_by_id()Ilya Dryomov2014-01-271-0/+5
| * | | libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()Ilya Dryomov2014-01-272-14/+19
| * | | libceph: introduce and start using oid abstractionIlya Dryomov2014-01-272-9/+11
| * | | libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LENIlya Dryomov2014-01-271-1/+1
| * | | libceph: start using oloc abstractionIlya Dryomov2014-01-271-3/+5
| * | | libceph: dout() is missing a newlineIlya Dryomov2014-01-261-2/+2
| * | | libceph: add ceph_kv{malloc,free}() and switch to themIlya Dryomov2014-01-263-27/+28
| * | | libceph: fix preallocation check in get_reply()Ilya Dryomov2014-01-142-4/+3
| * | | libceph: rename front to front_len in get_reply()Ilya Dryomov2014-01-141-4/+5
| * | | libceph: rename ceph_msg::front_max to front_alloc_lenIlya Dryomov2014-01-142-7/+7
| * | | libceph: use CEPH_MON_PORT when the specified port is 0Ilya Dryomov2013-12-311-1/+3
| * | | crush: fix crush_choose_firstn commentIlya Dryomov2013-12-311-1/+5
| * | | crush: attempts -> triesIlya Dryomov2013-12-311-8/+8
| * | | crush: add set_choose_local_[fallback_]tries stepsIlya Dryomov2013-12-311-5/+23
| * | | crush: generalize descend_onceIlya Dryomov2013-12-311-11/+14
| * | | crush: CHOOSE_LEAF -> CHOOSELEAF throughoutIlya Dryomov2013-12-311-5/+5
| * | | crush: add SET_CHOOSE_TRIES rule stepIlya Dryomov2013-12-311-0/+5
| * | | crush: apply chooseleaf_tries to firstn mode tooIlya Dryomov2013-12-311-4/+10
| * | | crush: new SET_CHOOSE_LEAF_TRIES commandIlya Dryomov2013-12-311-10/+21
| * | | crush: pass parent r value for indep callIlya Dryomov2013-12-311-4/+6
| * | | crush: clarify numrep vs endposIlya Dryomov2013-12-311-8/+8
| * | | crush: strip firstn conditionals out of crush_choose, renameIlya Dryomov2013-12-311-55/+33
| * | | crush: add note about r in recursive chooseIlya Dryomov2013-12-311-0/+8
| * | | crush: use breadth-first search for indep modeIlya Dryomov2013-12-311-9/+163
| * | | crush: return CRUSH_ITEM_UNDEF for failed placements with indepIlya Dryomov2013-12-311-2/+6
| * | | crush: eliminate CRUSH_MAX_SET result size limitationIlya Dryomov2013-12-312-7/+19
| * | | crush: fix some commentsIlya Dryomov2013-12-311-1/+1
| * | | crush: reduce scope of some local variablesIlya Dryomov2013-12-311-3/+3
| * | | crush: factor out (trivial) crush_destroy_rule()Ilya Dryomov2013-12-311-2/+5
| * | | crush: pass weight vector size to map functionIlya Dryomov2013-12-312-6/+13
| * | | libceph: update ceph_features.hIlya Dryomov2013-12-311-1/+3
| * | | libceph: all features fields must be u64Ilya Dryomov2013-12-312-4/+4
| * | | libceph: resend all writes after the osdmap loses the full flagJosh Durgin2013-12-131-6/+22
| * | | libceph: block I/O when PAUSE or FULL osd map flags are setJosh Durgin2013-12-131-2/+27
OpenPOWER on IntegriCloud