summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm+acpi-4.5-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2016-01-122-15/+11
|\
| *-. Merge branches 'pm-sleep' and 'pm-tools'Rafael J. Wysocki2016-01-122-15/+11
| |\ \
| | * | PM / sleep: Add support for read-only sysfs attributesRafael J. Wysocki2016-01-042-15/+11
| | |/
* | | Merge tag 'trace-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2016-01-126-228/+300
|\ \ \
| * | | 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-071-55/+106
| * | | tracing: Fix comment to use tracing_on over tracing_enableChuyu Hu2015-12-231-2/+2
| * | | 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
| * | | 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-233-91/+39
| * | | 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-251-2/+7
| * | | ftrace: Add new type to distinguish what kind of ftrace_bug()Steven Rostedt (Red Hat)2015-11-251-1/+36
| * | | 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
* | | | Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2016-01-126-62/+48
|\ \ \ \
| * | | | cgroup: fix a typo.Rami Rosen2016-01-101-1/+1
| * | | | cgroup: demote subsystem init messages to KERN_DEBUGTejun Heo2016-01-021-1/+1
| * | | | 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-071-27/+44
| |\ \ \ \
| * | | | | cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friendsOleg Nesterov2015-12-035-31/+14
| * | | | | Merge branch 'for-4.4-fixes' into for-4.5Tejun Heo2015-12-037-110/+107
| |\ \ \ \ \
| * | | | | | cpuset: Replace all instances of time_t with time64_tArnd Bergmann2015-11-251-4/+8
| * | | | | | cgroup: replace __DEVEL__sane_behavior with cgroup2 fs typeTejun Heo2015-11-161-24/+23
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2016-01-126-59/+187
|\ \ \ \ \ \ \
| * | | | | | | net: bpf: reject invalid shiftsRabin Vincent2016-01-121-0/+10
| * | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-01-061-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | bpf: hash: use per-bucket spinlocktom.leiming@gmail.com2015-12-291-18/+32
| * | | | | | | | bpf: hash: move select_bucket() out of htab's spinlocktom.leiming@gmail.com2015-12-291-4/+2
| * | | | | | | | bpf: hash: use atomic counttom.leiming@gmail.com2015-12-291-6/+6
| * | | | | | | | bpf: move clearing of A/X into classic to eBPF migration prologueDaniel Borkmann2015-12-181-4/+0
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-12-1723-177/+270
| |\ \ \ \ \ \ \ \
| * | | | | | | | | net, cgroup: cgroup_sk_updat_lock was missing initializerTejun Heo2015-12-141-1/+1
| * | | | | | | | | bpf, inode: allow for rename and link opsDaniel Borkmann2015-12-121-0/+20
| * | | | | | | | | sock, cgroup: add sock->sk_cgroupTejun Heo2015-12-081-1/+54
| * | | | | | | | | Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/ke...David S. Miller2015-12-081-27/+44
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | cgroup: implement cgroup_get_from_path() and expose cgroup_put()Tejun Heo2015-11-201-5/+34
| | * | | | | | | | cgroup: record ancestor IDs and reimplement cgroup_is_descendant() using itTejun Heo2015-11-201-22/+10
| * | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-12-0311-46/+107
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | bpf: add show_fdinfo handler for mapsDaniel Borkmann2015-11-201-1/+21
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-01-125-104/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | kernel/*: switch to memdup_user_nul()Al Viro2016-01-044-95/+48
| * | | | | | | | | | convert a bunch of open-coded instances of memdup_user_nul()Al Viro2016-01-041-9/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'work.copy_file_range' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2016-01-121-0/+1
|\ \ \ \ \ \ \ \ \ \