diff options
| -rw-r--r-- | KEYS-Add-a-system-blacklist-keyring.patch | 4 | ||||
| -rw-r--r-- | MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch | 4 | ||||
| -rw-r--r-- | Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch | 4 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | criu-no-expert.patch | 6 | ||||
| -rw-r--r-- | disable-libdw-unwind-on-non-x86.patch | 28 | ||||
| -rw-r--r-- | kernel.spec | 21 | ||||
| -rw-r--r-- | perf-install-trace-event-plugins.patch | 30 | ||||
| -rw-r--r-- | ppc64-fixtools.patch | 24 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | watchdog-Disable-watchdog-on-virtual-machines.patch | 8 |
11 files changed, 23 insertions, 110 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index 98df75570..6e1f3015c 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644 + #endif /* _KEYS_SYSTEM_KEYRING_H */ diff --git a/init/Kconfig b/init/Kconfig -index d2355812ba48..4fcd7dd882c2 100644 +index 1c505e090422..4fb572ae7423 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1722,6 +1722,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1732,6 +1732,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch index c2b5de2f3..26cf0d3e7 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -42,10 +42,10 @@ index 41359e548bcb..db9e6118575e 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index 4fcd7dd882c2..65ea201f38af 100644 +index 4fb572ae7423..b0138f178c7c 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1876,6 +1876,15 @@ config MODULE_SIG_ALL +@@ -1886,6 +1886,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index 055446894..ae7163994 100644 --- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch +++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch @@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index f8a07128a6e8..41eff584e169 100644 +index 04e9f5505faa..14563a76c8c8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3625,7 +3625,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3691,7 +3691,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the allocated input device; If set to 0, video driver will only send out the event without touching backlight brightness level. diff --git a/config-generic b/config-generic index ceac8662f..5ca47dfc0 100644 --- a/config-generic +++ b/config-generic @@ -4838,6 +4838,7 @@ CONFIG_OPTPROBES=y CONFIG_HZ_1000=y CONFIG_NO_HZ=y +# CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_TIMER_STATS=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PERF_EVENTS=y @@ -5088,6 +5089,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set # CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_TASKS_RCU is not set # CONFIG_RCU_USER_QS is not set CONFIG_SPARSE_RCU_POINTER=y diff --git a/criu-no-expert.patch b/criu-no-expert.patch index d6e3bb0e1..a32c53dcd 100644 --- a/criu-no-expert.patch +++ b/criu-no-expert.patch @@ -9,10 +9,10 @@ Upstream-status: Fedora mustard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig -index 65ea201f38af..adfc3ba98571 100644 +index b0138f178c7c..faf5ff3b26ae 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1138,7 +1138,7 @@ config DEBUG_BLK_CGROUP +@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 65ea201f38af..adfc3ba98571 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE +@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES diff --git a/disable-libdw-unwind-on-non-x86.patch b/disable-libdw-unwind-on-non-x86.patch deleted file mode 100644 index a57c70608..000000000 --- a/disable-libdw-unwind-on-non-x86.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> -Date: Fri, 18 Apr 2014 06:58:29 -0400 -Subject: [PATCH] disable libdw unwind on non-x86 - -Bugzilla: 1025603 -Upstream-status: ?? ---- - tools/perf/config/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile -index 1f67aa02d240..86c21a24da46 100644 ---- a/tools/perf/config/Makefile -+++ b/tools/perf/config/Makefile -@@ -52,6 +52,10 @@ ifeq ($(ARCH),powerpc) - CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX - endif - -+ifneq ($(ARCH),x86) -+ NO_LIBDW_DWARF_UNWIND := 1 -+endif -+ - ifeq ($(LIBUNWIND_LIBS),) - NO_LIBUNWIND := 1 - else --- -1.9.3 - diff --git a/kernel.spec b/kernel.spec index a0d859b65..669721193 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -568,7 +568,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch # PPC -Patch18000: ppc64-fixtools.patch + # ARM64 # ARMv7 @@ -596,11 +596,6 @@ Patch21247: ath9k-rx-dma-stop-check.patch Patch22000: weird-root-dentry-name-debug.patch -#rhbz 1025603 -Patch25063: disable-libdw-unwind-on-non-x86.patch - -Patch26000: perf-install-trace-event-plugins.patch - # Patch series from Hans for various backlight and platform driver fixes Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch @@ -1190,7 +1185,7 @@ ApplyOptionalPatch upstream-reverts.patch -R ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # PPC -ApplyPatch ppc64-fixtools.patch + # ARM64 # @@ -1325,11 +1320,6 @@ ApplyPatch criu-no-expert.patch #rhbz 892811 ApplyPatch ath9k-rx-dma-stop-check.patch -#rhbz 1025603 -ApplyPatch disable-libdw-unwind-on-non-x86.patch - -ApplyPatch perf-install-trace-event-plugins.patch - # Patch series from Hans for various backlight and platform driver fixes ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch @@ -1883,7 +1873,7 @@ find $RPM_BUILD_ROOT/usr/include \ %if %{with_perf} # perf tool binary and supporting scripts/binaries -%{perf_make} DESTDIR=$RPM_BUILD_ROOT MULTILIBDIR=%{_lib} install-bin install-traceevent-plugins +%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin install-traceevent-plugins # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace @@ -2214,6 +2204,9 @@ fi # ||----w | # || || %changelog +* Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git7.1 +- Linux v3.17-8307-gf1d0d14120a8 + * Mon Oct 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> - Update armv7/aarch64 config options diff --git a/perf-install-trace-event-plugins.patch b/perf-install-trace-event-plugins.patch deleted file mode 100644 index 9a7ad3aa3..000000000 --- a/perf-install-trace-event-plugins.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Kyle McMartin <kmcmarti@redhat.com> -Date: Mon, 2 Jun 2014 15:11:01 -0400 -Subject: [PATCH] perf: install trace-event plugins - -perf hardcodes $libdir to be lib for all but x86_64, so kludge around it -until upstream gets their act together. ---- - tools/perf/config/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile -index 86c21a24da46..bf0fe97bd358 100644 ---- a/tools/perf/config/Makefile -+++ b/tools/perf/config/Makefile -@@ -642,8 +642,12 @@ endif - ifeq ($(IS_X86_64),1) - lib = lib64 - else -+ifdef MULTILIBDIR -+lib = $(MULTILIBDIR) -+else - lib = lib - endif -+endif - libdir = $(prefix)/$(lib) - - # Shell quote (do not use $(call) to accommodate ancient setups); --- -1.9.3 - diff --git a/ppc64-fixtools.patch b/ppc64-fixtools.patch deleted file mode 100644 index f8c934ba2..000000000 --- a/ppc64-fixtools.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Peter Robinson <pbrobinson@gmail.com> -Date: Mon, 6 Oct 2014 15:15:15 +0100 -Subject: [PATCH] ppc64-fixtools - -Build tools on ppc64le (rhbz 1138884), Some minor ppc64 cleanups ---- - tools/perf/arch/powerpc/util/skip-callchain-idx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/perf/arch/powerpc/util/skip-callchain-idx.c b/tools/perf/arch/powerpc/util/skip-callchain-idx.c -index a7c23a4b3778..d73ef8bb08c7 100644 ---- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c -+++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c -@@ -15,6 +15,7 @@ - - #include "util/thread.h" - #include "util/callchain.h" -+#include "util/debug.h" - - /* - * When saving the callchain on Power, the kernel conservatively saves --- -1.9.3 - @@ -1,3 +1,3 @@ fb30d0f29214d75cddd2faa94f73d5cf linux-3.17.tar.xz 159e969cbc27201d8e2fa0f609dc722f perf-man-3.17.tar.gz -5740b0a6b49144f85e75da8acb275576 patch-3.17-git6.xz +992c678dad773514a9c3ae553fe50d1c patch-3.17-git7.xz diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index 6d8bdf616..b37f14144 100644 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ b/watchdog-Disable-watchdog-on-virtual-machines.patch @@ -20,10 +20,10 @@ Signed-off-by: Dave Jones <davej@redhat.com> 1 file changed, 29 insertions(+) diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 7b223b212683..4757d7410087 100644 +index ff7fd80bef99..88aebd38b92f 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c -@@ -24,6 +24,7 @@ +@@ -19,6 +19,7 @@ #include <linux/sysctl.h> #include <linux/smpboot.h> #include <linux/sched/rt.h> @@ -31,7 +31,7 @@ index 7b223b212683..4757d7410087 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -113,6 +114,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -108,6 +109,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup); #endif @@ -64,7 +64,7 @@ index 7b223b212683..4757d7410087 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -660,6 +687,8 @@ out: +@@ -658,6 +685,8 @@ out: void __init lockup_detector_init(void) { |