]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42f930d 5cb0512)
Merge branch 'linus' into core/urgent, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Sat, 4 Nov 2017 07:53:04 +0000 (08:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 4 Nov 2017 07:53:04 +0000 (08:53 +0100)
We want to fix an objtool build warning that got introduced in the latest upstream kernel.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/futex.c patch | diff1 | diff2 | blob | history
kernel/watchdog_hld.c patch | diff1 | diff2 | blob | history

diff --cc kernel/futex.c
Simple merge
diff --cc kernel/watchdog_hld.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.