]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'rust/rust-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:54:03 +0000 (10:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:54:03 +0000 (10:54 +1000)
commita498d6c142fd9e550d28564f95e4a18556627156
tree5d5e75d61fa1548a4c9a13030172214ef59f471d
parentb0fdb2efa228c9e44ef91e99f1b3a74625f56747
parentfef0214731ccdff3f674940e579903ccc9638f93
Merge remote-tracking branch 'rust/rust-next'

# Conflicts:
# Makefile
# include/uapi/linux/android/binder.h
# kernel/printk/printk.c
16 files changed:
.gitignore
Documentation/index.rst
Documentation/process/changes.rst
MAINTAINERS
Makefile
include/uapi/linux/android/binder.h
init/Kconfig
kernel/kallsyms.c
kernel/printk/printk.c
lib/Kconfig.debug
samples/Kconfig
samples/Makefile
scripts/Makefile.build
scripts/Makefile.lib
scripts/kconfig/confdata.c
tools/lib/perf/include/perf/event.h