diff options
| -rw-r--r-- | 0001-Drop-that-for-now.patch | 2 | ||||
| -rw-r--r-- | KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch | 21 | ||||
| -rw-r--r-- | Kbuild-Add-an-option-to-enable-GCC-VTA.patch | 17 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_INPUT_MSM_VIBRATOR | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_MLX_WDT | 1 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch | 48 |
23 files changed, 59 insertions, 70 deletions
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index 6419d9d9a..1d1850944 100644 --- a/0001-Drop-that-for-now.patch +++ b/0001-Drop-that-for-now.patch @@ -14,7 +14,7 @@ index f5b1d0d168e0..5f31107b22d1 100644 @@ -430,7 +430,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ - -Werror-implicit-function-declaration -Werror=implicit-int \ + -Werror=implicit-function-declaration -Werror=implicit-int \ - -Wno-format-security \ + -Wno-format-security -Wno-address-of-packed-member \ -std=gnu89 diff --git a/KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch b/KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch index 1cc1e5370..1da06a1dd 100644 --- a/KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch +++ b/KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch @@ -1,4 +1,4 @@ -From fb2ac204a70da565de9ef9a9d6d69a40c2d59727 Mon Sep 17 00:00:00 2001 +From 7ec379c439ea60507804f96910d25196ab838ec4 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Fri, 5 May 2017 08:21:56 +0100 Subject: [PATCH] KEYS: Allow unrestricted boot-time addition of keys to @@ -12,6 +12,7 @@ This allows keys in the UEFI database to be added in secure boot mode for the purposes of module signing. Signed-off-by: David Howells <dhowells@redhat.com> +Signed-off-by: Jeremy Cline <jcline@redhat.com> --- certs/internal.h | 18 ++++++++++++++++++ certs/system_keyring.c | 33 +++++++++++++++++++++++++++++++++ @@ -20,7 +21,7 @@ Signed-off-by: David Howells <dhowells@redhat.com> diff --git a/certs/internal.h b/certs/internal.h new file mode 100644 -index 0000000..5dcbefb +index 000000000000..5dcbefb0c23a --- /dev/null +++ b/certs/internal.h @@ -0,0 +1,18 @@ @@ -43,21 +44,21 @@ index 0000000..5dcbefb + const void *data, size_t len); +#endif diff --git a/certs/system_keyring.c b/certs/system_keyring.c -index 6251d1b..5ac8ba6 100644 +index c05c29ae4d5d..183e73cc81f7 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <keys/asymmetric-type.h> #include <keys/system_keyring.h> #include <crypto/pkcs7.h> +#include "internal.h" - + static struct key *builtin_trusted_keys; #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING -@@ -265,3 +266,35 @@ int verify_pkcs7_signature(const void *data, size_t len, - EXPORT_SYMBOL_GPL(verify_pkcs7_signature); - - #endif /* CONFIG_SYSTEM_DATA_VERIFICATION */ +@@ -287,3 +288,35 @@ void __init set_platform_trusted_keys(struct key *keyring) + platform_trusted_keys = keyring; + } + #endif + +#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING +/** @@ -91,5 +92,5 @@ index 6251d1b..5ac8ba6 100644 +} +#endif /* CONFIG_SECONDARY_TRUSTED_KEYRING */ -- -2.9.3 +2.20.1 diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch index 39ec531ea..608d789dd 100644 --- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch +++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch @@ -1,3 +1,4 @@ +From a446d2f94ce540689c7a46bf457d92409e9c4d7e Mon Sep 17 00:00:00 2001 From: Josh Stone <jistone@redhat.com> Date: Fri, 21 Nov 2014 10:40:00 -0800 Subject: [PATCH] Kbuild: Add an option to enable GCC VTA @@ -37,32 +38,33 @@ Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: Michel Dänzer <michel@daenzer.net> Signed-off-by: Josh Stone <jistone@redhat.com> +Signed-off-by: Jeremy Cline <jcline@redhat.com> --- Makefile | 4 ++++ lib/Kconfig.debug | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 257ef5892ab7..3cc6f4477e78 100644 +index 9ef547fc7ffe..5777d902f8f3 100644 --- a/Makefile +++ b/Makefile -@@ -701,7 +701,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer +@@ -735,7 +735,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer endif endif +ifdef CONFIG_DEBUG_INFO_VTA -+KBUILD_CFLAGS += $(call cc-option, -fvar-tracking-assignments) ++DEBUG_CFLAGS += $(call cc-option, -fvar-tracking-assignments) +else - KBUILD_CFLAGS += $(call cc-option, -fno-var-tracking-assignments) + DEBUG_CFLAGS := $(call cc-option, -fno-var-tracking-assignments) +endif ifdef CONFIG_DEBUG_INFO ifdef CONFIG_DEBUG_INFO_SPLIT diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index e2894b23efb6..d98afe18f704 100644 +index 0d9e81779e37..424206212931 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug -@@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4 +@@ -217,7 +217,23 @@ config DEBUG_INFO_DWARF4 Generate dwarf4 debug info. This requires recent versions of gcc and gdb. It makes the debug information larger. But it significantly improves the success of resolving @@ -87,3 +89,6 @@ index e2894b23efb6..d98afe18f704 100644 config GDB_SCRIPTS bool "Provide GDB scripts for kernel debugging" +-- +2.20.1 + diff --git a/configs/fedora/generic/CONFIG_INPUT_MSM_VIBRATOR b/configs/fedora/generic/CONFIG_INPUT_MSM_VIBRATOR new file mode 100644 index 000000000..91282e4df --- /dev/null +++ b/configs/fedora/generic/CONFIG_INPUT_MSM_VIBRATOR @@ -0,0 +1 @@ +# CONFIG_INPUT_MSM_VIBRATOR is not set diff --git a/configs/fedora/generic/CONFIG_MLX_WDT b/configs/fedora/generic/CONFIG_MLX_WDT new file mode 100644 index 000000000..781edb096 --- /dev/null +++ b/configs/fedora/generic/CONFIG_MLX_WDT @@ -0,0 +1 @@ +CONFIG_MLX_WDT=m @@ -1 +1 @@ -12ad143e1b803e541e48b8ba40f550250259ecdd +ea295481b6e313b4ea3ca2720ffcafd6005b5643 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 8a458839e..1fe2ff135 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2475,6 +2475,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PM8941_PWRKEY is not set @@ -3362,6 +3363,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 4bf1d94ad..ad0d29082 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2459,6 +2459,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m # CONFIG_INPUT_PM8941_PWRKEY is not set @@ -3343,6 +3344,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 7d148623d..c49dc1285 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2537,6 +2537,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set CONFIG_INPUT_PALMAS_PWRBUTTON=m # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m @@ -3461,6 +3462,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4515cadfa..541086d43 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2429,6 +2429,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3329,6 +3330,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index e849f9f6f..655d90527 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2414,6 +2414,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3311,6 +3312,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 5ef6ecea7..fd52f962d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2522,6 +2522,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set CONFIG_INPUT_PALMAS_PWRBUTTON=m # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m @@ -3443,6 +3444,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 2139ed7b6..65c850270 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2253,6 +2253,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3165,6 +3166,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-i686.config b/kernel-i686.config index d6e5aaca7..0baa52aa8 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2236,6 +2236,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3146,6 +3147,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index d37b206d9..c1cab2ee2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2061,6 +2061,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PCSPKR is not set CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -2907,6 +2908,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 0146228cc..097598851 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2044,6 +2044,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PCSPKR is not set CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -2887,6 +2888,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a626fed68..e1f1642de 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2041,6 +2041,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -2881,6 +2882,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 878e3c16f..0b1e3ace9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2024,6 +2024,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -2861,6 +2862,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 46614c3e5..060aeec36 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2301,6 +2301,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3217,6 +3218,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4d1e49af3..1cf5d598c 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2284,6 +2284,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y +# CONFIG_INPUT_MSM_VIBRATOR is not set # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_PM8XXX_VIBRATOR=m @@ -3198,6 +3199,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLX_WDT=m # CONFIG_MMA7455_I2C is not set # CONFIG_MMA7455_SPI is not set CONFIG_MMA7660=m diff --git a/kernel.spec b/kernel.spec index d7e5eef3e..89cd0b31b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -525,8 +525,6 @@ Patch119: namespaces-no-expert.patch Patch120: ath9k-rx-dma-stop-check.patch -Patch121: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch - Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch # This no longer applies, let's see if it needs to be updated @@ -1859,6 +1857,9 @@ fi # # %changelog +* Tue Mar 12 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git6.1 +- Linux v5.0-10742-gea295481b6e3 + * Tue Mar 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> - Arm config updates and fixes @@ -1,2 +1,2 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 -SHA512 (patch-5.0-git5.xz) = 06b39d80d7f312dc7ca89f39a97b161fd14ebbfd62954181e7f4c95a58fd446d3c928e2af18715cf330a5c54d99bbeff31b7e49d47fb7a94618fa5201b9b349e +SHA512 (patch-5.0-git6.xz) = 7c3adc10924137687083ea86d0cc8b6a7ec98508f3c0fdcb31498f3d423b23f3a2a68aa1b20e2fb9566fa662671a18bbf9f4416f714c099ad5ad0bc584c3cc66 diff --git a/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch b/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch deleted file mode 100644 index 4c55bf2da..000000000 --- a/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> -Date: Fri, 27 Mar 2015 13:31:11 -0400 -Subject: [PATCH] xen/pciback: Don't disable PCI_COMMAND on PCI device reset. - -There is no need for this at all. Worst it means that if -the guest tries to write to BARs it could lead (on certain -platforms) to PCI SERR errors. - -Please note that with af6fc858a35b90e89ea7a7ee58e66628c55c776b -"xen-pciback: limit guest control of command register" -a guest is still allowed to enable those control bits (safely), but -is not allowed to disable them and that therefore a well behaved -frontend which enables things before using them will still -function correctly. - -This is done via an write to the configuration register 0x4 which -triggers on the backend side: -command_write - \- pci_enable_device - \- pci_enable_device_flags - \- do_pci_enable_device - \- pcibios_enable_device - \-pci_enable_resourcess - [which enables the PCI_COMMAND_MEMORY|PCI_COMMAND_IO] - -However guests (and drivers) which don't do this could cause -problems, including the security issues which XSA-120 sought -to address. - -Reported-by: Jan Beulich <jbeulich@suse.com> -Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> ---- - drivers/xen/xen-pciback/pciback_ops.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c -index c4a0666de6f5..26e651336787 100644 ---- a/drivers/xen/xen-pciback/pciback_ops.c -+++ b/drivers/xen/xen-pciback/pciback_ops.c -@@ -119,8 +119,6 @@ void xen_pcibk_reset_device(struct pci_dev *dev) - if (pci_is_enabled(dev)) - pci_disable_device(dev); - -- pci_write_config_word(dev, PCI_COMMAND, 0); -- - dev->is_busmaster = 0; - } else { - pci_read_config_word(dev, PCI_COMMAND, &cmd); |