git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cac9b9a e55a732)
Merge branch 'x86/debug' into core/urgent
authorThomas Gleixner <tglx@linutronix.de>
Thu, 18 Jul 2019 18:50:48 +0000 (20:50 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 18 Jul 2019 18:50:48 +0000 (20:50 +0200)
Pick up the two pending objtool patches as the next round of objtool fixes
depend on them.

1  2 
kernel/bpf/core.c patch | diff1 | diff2 | blob | history
tools/objtool/check.c patch | diff1 | diff2 | blob | history

diff --cc kernel/bpf/core.c
Simple merge
diff --cc tools/objtool/check.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.