Merge v4.4.142 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.142 into chromeos-4.4
,
Jul 24
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ee5dfa8cdd3b78b575f6fe68eac4b1f2a521e3fc commit ee5dfa8cdd3b78b575f6fe68eac4b1f2a521e3fc Author: Guenter Roeck <groeck@chromium.org> Date: Sat Jul 21 03:00:04 2018 CHROMIUM: Merge 'v4.4.142' into chromeos-4.4 Merge of v4.4.142 into chromeos-4.4 Conflicts: scripts/Kbuild.include Changelog: ---------------------------------------------------------------- Andy Lutomirski (1): x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6 Arnaldo Carvalho de Melo (1): perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/ Greg Kroah-Hartman (1): Linux 4.4.142 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.142' into merge/chromeos-4.4-v4.4.142 Rasmus Villemoes (1): Kbuild: fix # escaping in .cmd files for future Make Makefile | 2 +- arch/x86/kernel/cpu/common.c | 7 ++++--- scripts/Kbuild.include | 5 +++-- tools/arch/x86/include/asm/unistd_32.h | 9 +++++++++ tools/arch/x86/include/asm/unistd_64.h | 9 +++++++++ tools/build/Build.include | 5 +++-- tools/perf/config/Makefile | 1 + tools/perf/perf-sys.h | 18 ------------------ tools/perf/util/include/asm/unistd_32.h | 1 - tools/perf/util/include/asm/unistd_64.h | 1 - tools/scripts/Makefile.include | 2 ++ 11 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 tools/arch/x86/include/asm/unistd_32.h create mode 100644 tools/arch/x86/include/asm/unistd_64.h delete mode 100644 tools/perf/util/include/asm/unistd_32.h delete mode 100644 tools/perf/util/include/asm/unistd_64.h BUG= chromium:866159 TEST=Build and test on various affected systems Change-Id: I506df29d112ff32399ba550594f4155ba61bc570 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/ee5dfa8cdd3b78b575f6fe68eac4b1f2a521e3fc/scripts/Kbuild.include
,
Jul 24
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Jul 21