summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'trace-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2016-01-1316-276/+476
|\
| * ftrace: Fix the race between ftrace and insmodQiu Peiyang2016-01-071-9/+16
| * ftrace: Add infrastructure for delayed enabling of module functionsSteven Rostedt (Red Hat)2016-01-072-57/+110
| * x86: ftrace: Fix the comments for ftrace_modify_code_direct()Li Bin2016-01-051-7/+5
| * tracing: Fix comment to use tracing_on over tracing_enableChuyu Hu2015-12-231-2/+2
| * metag: ftrace: Fix the comments for ftrace_modify_codeLi Bin2015-12-231-6/+5
| * sh: ftrace: Fix the comments for ftrace_modify_code()Li Bin2015-12-231-7/+5
| * ia64: ftrace: Fix the comments for ftrace_modify_code()Li Bin2015-12-231-7/+5
| * ftrace: Clean up ftrace_module_init() codeSteven Rostedt (Red Hat)2015-12-231-6/+3
| * ftrace: Join functions ftrace_module_init() and ftrace_init_module()Abel Vesa2015-12-231-9/+6
| * tracing: Introduce TRACE_EVENT_FN_COND macroDenis Kirjanov2015-12-233-0/+16
| * tracing: Use seq_buf_used() in seq_buf_to_user() instead of lenJerry Snitselaar2015-12-231-2/+4
| * bpf: Constify bpf_verifier_ops structureJulia Lawall2015-12-231-1/+1
| * ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags tooSteven Rostedt (Red Hat)2015-12-231-12/+18
| * ftrace: Remove use of control list and opsSteven Rostedt (Red Hat)2015-12-234-108/+57
| * ftrace: Fix output of enabled_functions for showing trampSteven Rostedt (Red Hat)2015-12-231-3/+4
| * ftrace: Fix a typo in commentLi Bin2015-12-231-1/+1
| * ftrace: Show all tramps registered to a record on ftrace_bug()Steven Rostedt (Red Hat)2015-11-251-9/+37
| * ftrace: Add variable ftrace_expected for archs to show expected codeSteven Rostedt (Red Hat)2015-11-253-2/+22
| * ftrace: Add new type to distinguish what kind of ftrace_bug()Steven Rostedt (Red Hat)2015-11-252-1/+45
| * tracing: Update cond flag when enabling or disabling a triggerTom Zanussi2015-11-251-4/+6
| * ring-buffer: Process commits whenever moving to a new page.Steven Rostedt (Red Hat)2015-11-251-0/+7
| * ring-buffer: Remove redundant update of page timestampSteven Rostedt (Red Hat)2015-11-241-24/+8
| * ring-buffer: Use READ_ONCE() for most tail_page accessSteven Rostedt (Red Hat)2015-11-241-7/+11
| * ftracetest: Add instance create and delete testSteven Rostedt (Red Hat)2015-11-241-0/+90
* | Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2016-01-1327-961/+1467
|\ \
| * | cgroup: rename cgroup documentationsTejun Heo2016-01-1214-0/+0
| * | cgroup: fix a typo.Rami Rosen2016-01-101-1/+1
| * | cgroup: Remove resource_counter.txt in Documentation/cgroup-legacy/00-INDEX.Yuan Sun2016-01-051-2/+0
| * | cgroup: demote subsystem init messages to KERN_DEBUGTejun Heo2016-01-021-1/+1
| * | cgroup: Fix uninitialized variable warningRoss Zwisler2015-12-281-1/+1
| * | cgroup: put controller Kconfig options in meaningful orderJohannes Weiner2015-12-181-107/+107
| * | cgroup: clean up the kernel configuration menu nomenclatureJohannes Weiner2015-12-181-39/+26
| * | cgroup_pids: fix a typo.Rami Rosen2015-12-141-1/+1
| * | Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/ke...Tejun Heo2015-12-075-28/+140
| |\ \
| * | | Subject: cgroup: Fix incomplete dd command in blkio documentationYuan Sun2015-12-071-2/+1
| * | | cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friendsOleg Nesterov2015-12-038-71/+23
| * | | Merge branch 'for-4.4-fixes' into for-4.5Tejun Heo2015-12-0313-161/+169
| |\ \ \
| * | | | cpuset: Replace all instances of time_t with time64_tArnd Bergmann2015-11-251-4/+8
| * | | | cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentationTejun Heo2015-11-163-724/+1293
| * | | | cgroup: rename Documentation/cgroups/ to Documentation/cgroup-legacy/Tejun Heo2015-11-1614-0/+0
| * | | | cgroup: replace __DEVEL__sane_behavior with cgroup2 fs typeTejun Heo2015-11-164-29/+26
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2016-01-131739-25478/+70621
|\ \ \ \ \
| * | | | | net: bnxt: always return values from _bnxt_get_max_ringsArnd Bergmann2016-01-121-7/+9
| * | | | | net: bpf: reject invalid shiftsRabin Vincent2016-01-122-0/+15
| * | | | | phonet: properly unshare skbs in phonet_rcv()Eric Dumazet2016-01-121-0/+4
| * | | | | dwc_eth_qos: Fix dma address for multi-fragment skbsLars Persson2016-01-121-1/+1
| * | | | | phy: remove an unneeded conditionDan Carpenter2016-01-121-1/+1
| * | | | | mdio: remove an unneed conditionDan Carpenter2016-01-121-4/+2
| * | | | | mdio_bus: NULL dereference on allocation errorDan Carpenter2016-01-121-5/+6