summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2014-04-071-1/+1
|\
| * net: replace __this_cpu_inc in route.c with raw_cpu_incChristoph Lameter2014-04-071-1/+1
* | Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-04-072-65/+64
|\ \
| * | net/iucv/iucv.c: Fix CPU hotplug callback registrationSrivatsa S. Bhat2014-03-201-64/+57
| * | net/core/flow.c: Fix CPU hotplug callback registrationSrivatsa S. Bhat2014-03-201-1/+7
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-04-075-316/+864
|\ \ \ | |_|/ |/| |
| * | libceph: dump pool {read,write}_tier to debugfsIlya Dryomov2014-04-041-3/+3
| * | libceph: output primary affinity values on osdmap updatesIlya Dryomov2014-04-041-0/+2
| * | libceph: redo ceph_calc_pg_primary() in terms of ceph_calc_pg_acting()Ilya Dryomov2014-04-041-75/+4
| * | libceph: add support for osd primary affinityIlya Dryomov2014-04-041-0/+68
| * | libceph: add support for primary_temp mappingsIlya Dryomov2014-04-041-1/+6
| * | libceph: return primary from ceph_calc_pg_acting()Ilya Dryomov2014-04-042-14/+16
| * | libceph: switch ceph_calc_pg_acting() to new helpersIlya Dryomov2014-04-041-13/+38
| * | libceph: introduce apply_temps() helperIlya Dryomov2014-04-041-0/+52
| * | libceph: introduce pg_to_raw_osds() and raw_to_up_osds() helpersIlya Dryomov2014-04-041-0/+76
| * | libceph: primary_affinity decode bitsIlya Dryomov2014-04-041-0/+72
| * | libceph: primary_affinity infrastructureIlya Dryomov2014-04-042-2/+50
| * | libceph: primary_temp decode bitsIlya Dryomov2014-04-041-0/+69
| * | libceph: primary_temp infrastructureIlya Dryomov2014-04-042-1/+16
| * | libceph: generalize ceph_pg_mappingIlya Dryomov2014-04-042-6/+6
| * | libceph: introduce get_osdmap_client_data_v()Ilya Dryomov2014-04-041-16/+65
| * | libceph: introduce decode{,_new}_pg_temp() and switch to themIlya Dryomov2014-04-041-72/+67
| * | libceph: switch osdmap_set_max_osd() to krealloc()Ilya Dryomov2014-04-041-15/+17
| * | libceph: introduce decode{,_new}_pools() and switch to themIlya Dryomov2014-04-041-37/+57
| * | libceph: rename __decode_pool{,_names}() to decode_pool{,_names}()Ilya Dryomov2014-04-041-6/+8
| * | libceph: fix and clarify ceph_decode_need() sizesIlya Dryomov2014-04-041-6/+7
| * | libceph: nuke bogus encoding version check in osdmap_apply_incremental()Ilya Dryomov2014-04-041-5/+4
| * | libceph: fixup error handling in osdmap_apply_incremental()Ilya Dryomov2014-04-041-32/+34
| * | libceph: fix crush_decode() call site in osdmap_decode()Ilya Dryomov2014-04-041-5/+2
| * | libceph: check length of osdmap osd arraysIlya Dryomov2014-04-041-4/+10
| * | libceph: safely decode max_osd value in osdmap_decode()Ilya Dryomov2014-04-041-2/+4
| * | libceph: fixup error handling in osdmap_decode()Ilya Dryomov2014-04-041-26/+27
| * | libceph: split osdmap allocation and decode stepsIlya Dryomov2014-04-042-16/+30
| * | libceph: dump osdmap and enhance output on decode errorsIlya Dryomov2014-04-041-6/+15
| * | libceph: dump pg_temp mappings to debugfsIlya Dryomov2014-04-041-0/+11
| * | libceph: do not prefix osd lines with \t in debugfs outputIlya Dryomov2014-04-041-1/+1
| * | libceph: refer to osdmap directly in osdmap_show()Ilya Dryomov2014-04-041-12/+14
| * | crush: add SET_CHOOSELEAF_VARY_R stepIlya Dryomov2014-04-041-0/+5
| * | crush: add chooseleaf_vary_r tunableIlya Dryomov2014-04-041-6/+24
| * | crush: allow crush rules to set (re)tries counts to 0Ilya Dryomov2014-04-041-2/+2
| * | crush: fix off-by-one errors in total_tries refactorIlya Dryomov2014-04-041-19/+27
| * | libceph: fix oops in ceph_msg_data_{pages,pagelist}_advance()Yan, Zheng2014-04-041-0/+6
| * | libceph: add support for CEPH_OSD_OP_SETALLOCHINT osd opIlya Dryomov2014-04-031-0/+27
| * | libceph: encode CEPH_OSD_OP_FLAG_* op flagsIlya Dryomov2014-04-031-0/+2
| * | libceph: a per-osdc crush scratch bufferIlya Dryomov2014-04-031-9/+16
* | | Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-04-066-68/+93
|\ \ \
| * | | SUNRPC: rpc_restart_call/rpc_restart_call_prepare should clear task->tk_statusTrond Myklebust2014-03-201-0/+2
| * | | SUNRPC: Don't let rpc_delay() clobber non-timeout errorsTrond Myklebust2014-03-201-1/+2
| * | | SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasksSteve Dickson2014-03-201-2/+2
| * | | SUNRPC: Ensure call_status() deals correctly with SOFTCONN tasksTrond Myklebust2014-03-191-0/+4
OpenPOWER on IntegriCloud