www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 21c2c4e 81910a6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 04:03:31 +0000 (14:03 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 04:03:31 +0000 (14:03 +1000)
commit	5efdb12aea273cfde4a46acecd09cd45d1982146
tree	761ae154c3c1501d8117e42aea42841fedc28d6f	tree
parent	21c2c4e8db92aa03d5dce141f0fa723cb95c509a	commit \| diff
parent	81910a634d57a090d033c14b1336c0b11aaf774b	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

# Conflicts:
# samples/kprobes/kprobe_example.c

14 files changed:

Documentation/admin-guide/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/admin-guide/sysctl/kernel.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/riscv/kernel/probes/kprobes.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/kprobes.h	diff1 \|	diff2 \|	blob \| history
kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
samples/kprobes/kprobe_example.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.build	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.