summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* bpf: fix two bugs in verification logic when accessing 'ctx' pointerAlexei Starovoitov2015-04-161-2/+7
* bpf: fix verifier memory corruptionAlexei Starovoitov2015-04-161-1/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-04-159-116/+205
|\
| * Merge branch 'iocb' into for-davemAl Viro2015-04-092-2/+3
| |\
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-027-34/+94
| |\ \
| * | | tc: bpf: generalize pedit actionAlexei Starovoitov2015-03-291-0/+2
| * | | ebpf: add sched_act_type and map it to sk_filter's verifier opsDaniel Borkmann2015-03-201-0/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-03-203-7/+27
| |\ \ \
| * | | | bpf: allow extended BPF programs access skb fieldsAlexei Starovoitov2015-03-152-17/+137
| * | | | ebpf: add helper for obtaining current processor idDaniel Borkmann2015-03-152-0/+13
| * | | | ebpf: add prandom helper for packet samplingDaniel Borkmann2015-03-152-0/+14
| * | | | ebpf: verifier: check that call reg with ARG_ANYTHING is initializedDaniel Borkmann2015-03-121-1/+4
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-03-0910-44/+137
| |\ \ \ \
| * | | | | ebpf: bpf_map_*: fix linker error on avr32 and openrisc archDaniel Borkmann2015-03-061-0/+5
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-03-0316-163/+247
| |\ \ \ \ \
| * | | | | | cls_bpf: add initial eBPF support for programmable classifiersDaniel Borkmann2015-03-011-0/+2
| * | | | | | ebpf: move read-only fields to bpf_prog and shrink bpf_prog_auxDaniel Borkmann2015-03-012-6/+5
| * | | | | | ebpf: add sched_cls_type and map it to sk_filter's verifier opsDaniel Borkmann2015-03-011-2/+13
| * | | | | | ebpf: constify various function pointer structsDaniel Borkmann2015-03-013-9/+9
| * | | | | | ebpf: remove kernel test stubsDaniel Borkmann2015-03-012-81/+0
* | | | | | | Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2015-04-142-3/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge back earlier suspend/hibernate material for v4.1.Rafael J. Wysocki2015-04-102-3/+12
| |\ \ \ \ \ \ \
| | * | | | | | | PM / sleep: add pm-trace support for suspending phaseZhonghui Fu2015-03-181-1/+1
| | * | | | | | | PM / sleep: add configurable delay for pm_testBrian Norris2015-02-261-2/+11
* | | | | | | | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-04-143-98/+244
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | kernel, cpuset: remove exception for __GFP_THISNODEDavid Rientjes2015-04-141-13/+5
| * | | | | | | | | watchdog: introduce the hardlockup_detector_disable() functionUlrich Obergfell2015-04-141-19/+2
| * | | | | | | | | watchdog: clean up some function names and argumentsUlrich Obergfell2015-04-141-8/+12
| * | | | | | | | | watchdog: enable the new user interface of the watchdog mechanismUlrich Obergfell2015-04-142-76/+40
| * | | | | | | | | watchdog: implement error handling for failure to set up hardware perf eventsUlrich Obergfell2015-04-141-0/+30
| * | | | | | | | | watchdog: introduce separate handlers for parameters in /proc/sys/kernelUlrich Obergfell2015-04-141-0/+59
| * | | | | | | | | watchdog: introduce proc_watchdog_common()Ulrich Obergfell2015-04-141-0/+65
| * | | | | | | | | watchdog: move definition of 'watchdog_proc_mutex' outside of proc_dowatchdog()Ulrich Obergfell2015-04-141-1/+2
| * | | | | | | | | watchdog: introduce the proc_watchdog_update() functionUlrich Obergfell2015-04-141-0/+23
| * | | | | | | | | watchdog: new definitions and variables, initializationUlrich Obergfell2015-04-141-1/+26
* | | | | | | | | | Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-04-142-2/+3
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'iocb' into for-nextAl Viro2015-04-112-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | fs: move struct kiocb to fs.hChristoph Hellwig2015-03-252-1/+2
| | * | | | | | | | fs: remove ki_nbytesChristoph Hellwig2015-03-121-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2015-04-1411-180/+1226
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | watchdog: Add watchdog enable/disable all functionsStephane Eranian2015-04-021-0/+28
| * | | | | | | | | Merge branch 'perf/urgent' into perf/core, before applying dependent patchesIngo Molnar2015-04-024-32/+70
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | perf: Add ITRACE_START record to indicate that tracing has startedAlexander Shishkin2015-04-021-0/+41
| * | | | | | | | | | perf: Add wakeup watermark control to the AUX areaAlexander Shishkin2015-04-023-5/+24
| * | | | | | | | | | perf: Support overwrite mode for the AUX areaAlexander Shishkin2015-04-022-15/+34
| * | | | | | | | | | perf: Add API for PMUs to write to the AUX areaAlexander Shishkin2015-04-023-3/+145
| * | | | | | | | | | perf: Add AUX recordAlexander Shishkin2015-04-022-0/+37
| * | | | | | | | | | perf: Add a pmu capability for "exclusive" eventsAlexander Shishkin2015-04-021-2/+117
| * | | | | | | | | | perf: Add a capability for AUX_NO_SG pmus to do software double bufferingAlexander Shishkin2015-04-021-1/+14
| * | | | | | | | | | perf: Support high-order allocations for AUX spaceAlexander Shishkin2015-04-021-6/+50
OpenPOWER on IntegriCloud