From: Greg Kroah-Hartman Date: Sun, 3 Jun 2018 12:12:45 +0000 (+0200) Subject: objtool-4.9: add some proper patch comments and rename patches X-Git-Tag: v4.9.106~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b06b4533c843b2854c4b17fb597ee88d4250303e;p=thirdparty%2Fkernel%2Fstable-queue.git objtool-4.9: add some proper patch comments and rename patches --- diff --git a/objtool-4.9/objtool_headers_sync.patch b/objtool-4.9/objtool-header-file-sync-up.patch similarity index 93% rename from objtool-4.9/objtool_headers_sync.patch rename to objtool-4.9/objtool-header-file-sync-up.patch index a661ecc513a..c0ea40eef4e 100644 --- a/objtool-4.9/objtool_headers_sync.patch +++ b/objtool-4.9/objtool-header-file-sync-up.patch @@ -4,6 +4,11 @@ To: Greg KH From: Greg Kroah-Hartman Subject: objtool: header file sync-up +From: Greg Kroah-Hartman + +When building tools/objtool/ it rightly complains about a number of +files being out of sync. Fix this up by syncing them properly with the +relevant in-kernel versions. Signed-off-by: Greg Kroah-Hartman diff --git a/objtool-4.9/objtool-move-checking-code-to-check.c.patch b/objtool-4.9/objtool-move-checking-code-to-check.c.patch index 3210da9b574..b65e4660193 100644 --- a/objtool-4.9/objtool-move-checking-code-to-check.c.patch +++ b/objtool-4.9/objtool-move-checking-code-to-check.c.patch @@ -20,6 +20,7 @@ Cc: Thomas Gleixner Cc: live-patching@vger.kernel.org Link: http://lkml.kernel.org/r/294c5c695fd73c1a5000bbe5960a7c9bec4ee6b4.1498659915.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar +[backported by hand to 4.9, this was a pain... - gregkh] Signed-off-by: Greg Kroah-Hartman --- diff --git a/objtool-4.9/objdiff.patch b/objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch similarity index 99% rename from objtool-4.9/objdiff.patch rename to objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch index b070fdbc135..4c41fe3d8a8 100644 --- a/objtool-4.9/objdiff.patch +++ b/objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch @@ -4,7 +4,27 @@ To: Greg KH From: Greg Kroah-Hartman Subject: objtool: sync up with the 4.14.47 version of objtool +There are pros and cons of dealing with tools in the kernel directory. +The pros are the fact that development happens fast, and new features +can be added to the kernel and the tools at the same times. The cons +are when dealing with backported kernel patches, it can be necessary to +backport parts of the tool changes as well. +For 4.9.y so far, we have backported individual patches. That quickly +breaks down when there are minor differences between how backports were +handled, so grabbing 40+ patch long series can be difficult, not +impossible, but really frustrating to attempt. + +To help mitigate this mess, here's a single big patch to sync up the +objtool logic to the 4.14.47 version of the tool. From this point +forward (after some other minor header file patches are applied), the +tool should be in sync and much easier to maintain over time. + +This has survivied my limited testing, and as the codebase is identical +to 4.14.47, I'm pretty comfortable dropping this big change in here in +4.9.y. Hopefully all goes well... + +Cc: Josh Poimboeuf Signed-off-by: Greg Kroah-Hartman --- diff --git a/objtool-4.9/perf_headers_sync.patch b/objtool-4.9/perf-tools-header-file-sync-up.patch similarity index 98% rename from objtool-4.9/perf_headers_sync.patch rename to objtool-4.9/perf-tools-header-file-sync-up.patch index 3311a5fbac8..d78f62152e6 100644 --- a/objtool-4.9/perf_headers_sync.patch +++ b/objtool-4.9/perf-tools-header-file-sync-up.patch @@ -4,6 +4,11 @@ To: Greg KH From: Greg Kroah-Hartman Subject: perf/tools: header file sync up +From: Greg Kroah-Hartman + +When building tools/perf/ it rightly complains about a number of .h +files being out of sync. Fix this up by syncing them properly with the +relevant in-kernel versions. Signed-off-by: Greg Kroah-Hartman diff --git a/objtool-4.9/series b/objtool-4.9/series index 082f84a366c..862af42d2e7 100644 --- a/objtool-4.9/series +++ b/objtool-4.9/series @@ -17,13 +17,13 @@ tools-include-adopt-__same_type-and-__must_be_array-from-the-kernel.patch tools-include-move-array_size-to-linux-kernel.h.patch tools-include-drop-array_size-definition-from-linux-hashtable.h.patch tools-include-include-missing-headers-for-fls-and-types-in-linux-log2.h.patch -objdiff.patch +objtool-sync-up-with-the-4.14.47-version-of-objtool.patch objtool-support-gcc-8-s-cold-subfunctions.patch objtool-support-gcc-8-switch-tables.patch objtool-detect-rip-relative-switch-table-references.patch objtool-detect-rip-relative-switch-table-references-part-2.patch objtool-fix-noreturn-detection-for-recursive-sibling-calls.patch objtool-x86-add-several-functions-and-files-to-the-objtool-whitelist.patch -perf_headers_sync.patch -objtool_headers_sync.patch -xen-fixup.patch +perf-tools-header-file-sync-up.patch +objtool-header-file-sync-up.patch +x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch diff --git a/objtool-4.9/xen-fixup.patch b/objtool-4.9/x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch similarity index 100% rename from objtool-4.9/xen-fixup.patch rename to objtool-4.9/x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch