aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-07 08:56:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-07 08:56:04 -0700
commit573de2a6e844cb230c4483833f29b8344a6a17cc (patch)
tree98dd321fc5b6dd9f4b6bf1bcaa6cb6f4a663301f /init/main.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff)
parentMerge branches 'for-5.1/upstream-fixes' and 'for-5.2/core' into for-linus (diff)
downloadlinux-dev-573de2a6e844cb230c4483833f29b8344a6a17cc.tar.xz
linux-dev-573de2a6e844cb230c4483833f29b8344a6a17cc.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching updates from Jiri Kosina: - livepatching kselftests improvements from Joe Lawrence and Miroslav Benes - making use of gcc's -flive-patching option when available, from Miroslav Benes - kobject handling cleanups, from Petr Mladek * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: livepatch: Remove duplicated code for early initialization livepatch: Remove custom kobject state handling livepatch: Convert error about unsupported reliable stacktrace into a warning selftests/livepatch: Add functions.sh to TEST_PROGS_EXTENDED kbuild: use -flive-patching when CONFIG_LIVEPATCH is enabled selftests/livepatch: use TEST_PROGS for test scripts
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions