diff options
| -rw-r--r-- | crash-driver.patch | 2 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/crash-driver.patch b/crash-driver.patch index 211d67fda..164dc90f5 100644 --- a/crash-driver.patch +++ b/crash-driver.patch @@ -326,7 +326,7 @@ index 0000000..085378a +#include <linux/miscdevice.h> +#include <linux/init.h> +#include <asm/io.h> -+#include <asm/uaccess.h> ++#include <linux/uaccess.h> +#include <asm/types.h> +#include <asm/crash-driver.h> + @@ -1 +1 @@ -195303136f192d37b89e20a8d1d2670d0d825266 +f12e840c819bab42621685558a01d3f46ab9a226 diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a74430444..28c35abe2 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2909,7 +2909,7 @@ CONFIG_MIGRATION=y CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y -CONFIG_MISC_ALCOR_PCI=m +# CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 3003e0843..272ba0f27 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2888,7 +2888,7 @@ CONFIG_MIGRATION=y CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y -CONFIG_MISC_ALCOR_PCI=m +# CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set diff --git a/kernel.spec b/kernel.spec index 6ce1c7eb0..5161ce10b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1898,6 +1898,9 @@ fi # # %changelog +* Mon Dec 31 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git4.1 +- Linux v4.20-9221-gf12e840c819b + * Sun Dec 30 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git3.1 - Linux v4.20-9163-g195303136f19 @@ -1,2 +1,2 @@ SHA512 (linux-4.20.tar.xz) = e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4 -SHA512 (patch-4.20-git3.xz) = 01082f5ba1c0a4a13c9d10a96b32c2199604231bf55596d55947990f1e06d64a7413f0662203f4278a6385a7a8e3ba0fbd8c52f208945951ec2570e4def55266 +SHA512 (patch-4.20-git4.xz) = 923c85ddb79c38e9e20ad55bcb860de8d0dec8b151f5a94be84afa50ad9199f8407ed601e3a6ec397da6f01f7871bb2ed7bdb2b55ee59dfb0849f395806a1710 |