From 3a54cf657007756e5017b319cc54447d7f84c74c Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 04 2019 00:22:40 +0000 Subject: Update to 4.14.115 --- diff --git a/.kernel.metadata b/.kernel.metadata index 392d855..8d339b2 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,3 +1,3 @@ c64d80ad01a6a77bf46bce1bdc5c7f28bfb6bfd5 SOURCES/linux-4.14.tar.xz 7c7b661673896f836b505d872aa1ee842062c60e SOURCES/perf-man-4.14.tar.gz -c8fcda8ec62add9e78c916d49ac486eab57fa695 SOURCES/patch-4.14.111.xz +275013ca7f4c72cb63323394bfe2ea7eaeedda80 SOURCES/patch-4.14.115.xz diff --git a/SOURCES/kbuild-AFTER_LINK.patch b/SOURCES/kbuild-AFTER_LINK.patch index 9f7b54f..0fd5bc7 100644 --- a/SOURCES/kbuild-AFTER_LINK.patch +++ b/SOURCES/kbuild-AFTER_LINK.patch @@ -96,16 +96,16 @@ index d540966..eeb47b6 100644 +++ b/arch/x86/entry/vdso/Makefile @@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \ quiet_cmd_vdso = VDSO $@ - cmd_vdso = $(CC) -nostdlib -o $@ \ + cmd_vdso = $(LD) -nostdlib -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -- -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ +- -T $(filter %.lds,$^) $(filter %.o,$^) && \ - sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' -+ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \ ++ -T $(filter %.lds,$^) $(filter %.o,$^) \ + $(if $(AFTER_LINK),; $(AFTER_LINK)) && \ + sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' - VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \ - $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS) + VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ + $(call ld-option, --build-id) -Bsymbolic diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index f742c65..526eee4 100755 --- a/scripts/link-vmlinux.sh diff --git a/SOURCES/kernel-aarch64-debug.config b/SOURCES/kernel-aarch64-debug.config index bed7296..d90937b 100644 --- a/SOURCES/kernel-aarch64-debug.config +++ b/SOURCES/kernel-aarch64-debug.config @@ -2694,6 +2694,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-aarch64.config b/SOURCES/kernel-aarch64.config index 39fabd6..17c8496 100644 --- a/SOURCES/kernel-aarch64.config +++ b/SOURCES/kernel-aarch64.config @@ -2675,6 +2675,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-armv7hl-debug.config b/SOURCES/kernel-armv7hl-debug.config index 072fe13..0126d92 100644 --- a/SOURCES/kernel-armv7hl-debug.config +++ b/SOURCES/kernel-armv7hl-debug.config @@ -2869,6 +2869,7 @@ CONFIG_LCD_S6E63M0=m CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m # CONFIG_LDM_DEBUG is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set CONFIG_LEDS_AS3645A=m diff --git a/SOURCES/kernel-armv7hl-lpae-debug.config b/SOURCES/kernel-armv7hl-lpae-debug.config index 8ddd80f..09684d9 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug.config +++ b/SOURCES/kernel-armv7hl-lpae-debug.config @@ -2733,6 +2733,7 @@ CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-armv7hl-lpae.config b/SOURCES/kernel-armv7hl-lpae.config index be03f85..274c421 100644 --- a/SOURCES/kernel-armv7hl-lpae.config +++ b/SOURCES/kernel-armv7hl-lpae.config @@ -2714,6 +2714,7 @@ CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-armv7hl.config b/SOURCES/kernel-armv7hl.config index 603606d..d3a089f 100644 --- a/SOURCES/kernel-armv7hl.config +++ b/SOURCES/kernel-armv7hl.config @@ -2849,6 +2849,7 @@ CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-i686-PAE.config b/SOURCES/kernel-i686-PAE.config index 7309d82..63b5554 100644 --- a/SOURCES/kernel-i686-PAE.config +++ b/SOURCES/kernel-i686-PAE.config @@ -2585,6 +2585,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-i686-PAEdebug.config b/SOURCES/kernel-i686-PAEdebug.config index be43741..e04758a 100644 --- a/SOURCES/kernel-i686-PAEdebug.config +++ b/SOURCES/kernel-i686-PAEdebug.config @@ -2605,6 +2605,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-i686-debug.config b/SOURCES/kernel-i686-debug.config index f8e357d..0ba3892 100644 --- a/SOURCES/kernel-i686-debug.config +++ b/SOURCES/kernel-i686-debug.config @@ -2605,6 +2605,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-i686.config b/SOURCES/kernel-i686.config index a5b5a0b..45152a3 100644 --- a/SOURCES/kernel-i686.config +++ b/SOURCES/kernel-i686.config @@ -2585,6 +2585,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-ppc64-debug.config b/SOURCES/kernel-ppc64-debug.config index 4ded1db..8c4cab6 100644 --- a/SOURCES/kernel-ppc64-debug.config +++ b/SOURCES/kernel-ppc64-debug.config @@ -2456,6 +2456,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-ppc64.config b/SOURCES/kernel-ppc64.config index 16c0532..165d62f 100644 --- a/SOURCES/kernel-ppc64.config +++ b/SOURCES/kernel-ppc64.config @@ -2436,6 +2436,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-ppc64le-debug.config b/SOURCES/kernel-ppc64le-debug.config index 024c02c..f8ef958 100644 --- a/SOURCES/kernel-ppc64le-debug.config +++ b/SOURCES/kernel-ppc64le-debug.config @@ -2401,6 +2401,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-ppc64le.config b/SOURCES/kernel-ppc64le.config index 1664193..d337e6a 100644 --- a/SOURCES/kernel-ppc64le.config +++ b/SOURCES/kernel-ppc64le.config @@ -2381,6 +2381,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-s390x-debug.config b/SOURCES/kernel-s390x-debug.config index 025469c..3d758d2 100644 --- a/SOURCES/kernel-s390x-debug.config +++ b/SOURCES/kernel-s390x-debug.config @@ -2348,6 +2348,7 @@ CONFIG_LATENCYTOP=y # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set CONFIG_LCS=m +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-s390x.config b/SOURCES/kernel-s390x.config index 651e285..8895d54 100644 --- a/SOURCES/kernel-s390x.config +++ b/SOURCES/kernel-s390x.config @@ -2328,6 +2328,7 @@ CONFIG_LATENCYTOP=y # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set CONFIG_LCS=m +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-x86_64-debug.config b/SOURCES/kernel-x86_64-debug.config index 293f004..79aba3c 100644 --- a/SOURCES/kernel-x86_64-debug.config +++ b/SOURCES/kernel-x86_64-debug.config @@ -2660,6 +2660,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SOURCES/kernel-x86_64.config b/SOURCES/kernel-x86_64.config index 9998775..22a7967 100644 --- a/SOURCES/kernel-x86_64.config +++ b/SOURCES/kernel-x86_64.config @@ -2640,6 +2640,7 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_DEBUG is not set CONFIG_LDM_PARTITION=y # CONFIG_LEDS_AAT1290 is not set diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 157ab2d..6d8961e 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 111 +%define stable_update 115 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2239,6 +2239,9 @@ fi # # %changelog +* Fri May 3 2019 Pablo Greco - 4.14.115-200 +- Rebase to LTS 4.14.115 + * Sat Apr 13 2019 Pablo Greco - 4.14.111-200 - Rebase to LTS 4.14.111