diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-01-26 12:57:38 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-01-26 12:57:38 -0600 |
| commit | 16838a0aa56767d53e0207778de72b2ed63249b3 (patch) | |
| tree | 10d6813ba62634a3fca50f91168b95e83f6a4f61 | |
| parent | 1af963ae315471dd7486b5edc6eae85c853df7d3 (diff) | |
| download | kernel-16838a0aa56767d53e0207778de72b2ed63249b3.tar.gz kernel-16838a0aa56767d53e0207778de72b2ed63249b3.tar.xz kernel-16838a0aa56767d53e0207778de72b2ed63249b3.zip | |
kernel-5.11.0-0.rc5.20210126git13391c60da33.135
* Tue Jan 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210126git13391c60da33.135]
- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
- redhat: add genlog.py script (Herton R. Krzesinski)
- Turn off vdso_install for ppc (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
26 files changed, 16 insertions, 71 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 491ac67d5..d7d73a157 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 134 +RHEL_RELEASE = 135 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 69e166c78..2016f5f21 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -212,7 +212,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7836,7 +7835,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set CONFIG_VFIO_PLATFORM=m @@ -8229,7 +8227,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8b2569ffb..74e14fbf7 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -168,7 +168,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6152,7 +6151,6 @@ CONFIG_VFIO=m CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM is not set CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y @@ -6450,7 +6448,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 77036bc1d..07428359c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -212,7 +212,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7811,7 +7810,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set CONFIG_VFIO_PLATFORM=m @@ -8203,7 +8201,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b573e76d9..6abf37501 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -168,7 +168,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6128,7 +6127,6 @@ CONFIG_VFIO=m CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM is not set CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y @@ -6426,7 +6424,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 563fbb9ca..c7464e8cb 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -209,7 +209,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -8104,7 +8103,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m CONFIG_VFIO_PLATFORM=m @@ -8531,7 +8529,6 @@ CONFIG_Z3FOLD=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index b84062e63..2f8f79344 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -209,7 +209,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -8082,7 +8081,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m CONFIG_VFIO_PLATFORM=m @@ -8508,7 +8506,6 @@ CONFIG_Z3FOLD=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index dfe213098..1c51ad499 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -207,7 +207,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -7850,7 +7849,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m CONFIG_VFIO_PLATFORM=m @@ -8262,7 +8260,6 @@ CONFIG_Z3FOLD=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index e39a5e817..d49510d1c 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -207,7 +207,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -7828,7 +7827,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m CONFIG_VFIO_PLATFORM=m @@ -8239,7 +8237,6 @@ CONFIG_Z3FOLD=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 751e037b0..c3fd5a470 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -227,7 +227,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7049,7 +7048,6 @@ CONFIG_VFIO_MDEV=m CONFIG_VFIO_PCI_IGD=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -7510,7 +7508,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index be3c50e37..00c97bbf8 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -227,7 +227,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7027,7 +7026,6 @@ CONFIG_VFIO_MDEV=m CONFIG_VFIO_PCI_IGD=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -7487,7 +7485,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f781ba5f6..3f94c4417 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -200,7 +200,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -6628,7 +6627,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6992,7 +6990,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 0402379ed..ce7981907 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -163,7 +163,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -6000,7 +5999,6 @@ CONFIG_VFIO=m # CONFIG_VFIO_NOIOMMU is not set # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6298,7 +6296,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c9b76418e..2f05413c8 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -200,7 +200,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -6605,7 +6604,6 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6968,7 +6966,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 22bb76313..7a4cf5edb 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -163,7 +163,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -5981,7 +5980,6 @@ CONFIG_VFIO=m # CONFIG_VFIO_NOIOMMU is not set # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6279,7 +6277,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4bfde3c91..907753e6f 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -200,7 +200,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y @@ -6929,7 +6928,7 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set +CONFIG_ZCRYPT_DEBUG=y CONFIG_ZCRYPT=m CONFIG_ZCRYPT_MULTIDEVNODES=y # CONFIG_ZD1211RW_DEBUG is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 32c9801a1..342ea50d2 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -160,7 +160,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y # CONFIG_ANDROID is not set @@ -6249,7 +6248,7 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set # CONFIG_ZBUD is not set -# CONFIG_ZCRYPT_DEBUG is not set +CONFIG_ZCRYPT_DEBUG=y CONFIG_ZCRYPT=m CONFIG_ZCRYPT_MULTIDEVNODES=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 90c8b83a5..755f8623f 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -200,7 +200,6 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMIGA_PARTITION=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 8c438a638..cfadae9da 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -160,7 +160,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y # CONFIG_ANDROID is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d384bd86f..12973ee50 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -160,7 +160,6 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 9dadc947d..8aea208f0 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7107,7 +7107,6 @@ CONFIG_VFIO_MDEV=m CONFIG_VFIO_PCI_IGD=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -7564,7 +7563,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index c67d9b917..6e02e2577 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -182,7 +182,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set +CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6213,7 +6213,6 @@ CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m # CONFIG_VFIO_PCI_VGA is not set -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6578,7 +6577,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e391a1d92..dfd9169dd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7083,7 +7083,6 @@ CONFIG_VFIO_MDEV=m CONFIG_VFIO_PCI_IGD=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -7539,7 +7538,6 @@ CONFIG_YELLOWFIN=m CONFIG_YENTA=m CONFIG_Z3FOLD=y CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZD1211RW=m CONFIG_ZEROPLUS_FF=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 47b707704..7fa62fcaa 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -182,7 +182,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_SFH_HID is not set +CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6191,7 +6191,6 @@ CONFIG_VFIO_NOIOMMU=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_PCI=m # CONFIG_VFIO_PCI_VGA is not set -CONFIG_VFIO_PCI_ZDEV=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set @@ -6556,7 +6555,6 @@ CONFIG_XZ_DEC=y CONFIG_YENTA=m # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y -# CONFIG_ZCRYPT_DEBUG is not set # CONFIG_ZEROPLUS_FF is not set # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ZISOFS=y diff --git a/kernel.spec b/kernel.spec index 092934647..f00945627 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.134 +%global distro_build 0.rc5.20210126git13391c60da33.135 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc5.134 +%define pkgrelease 0.rc5.20210126git13391c60da33.135 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.134%{?buildid}%{?dist} +%define specrelease 0.rc5.20210126git13391c60da33.135%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -201,7 +201,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.11 @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11-rc5.tar.xz +Source0: linux-20210126git13391c60da33.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11-rc5 -c -mv linux-5.11-rc5 linux-%{KVERREL} +%setup -q -n kernel-20210126git13391c60da33 -c +mv linux-20210126git13391c60da33 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,7 +2735,7 @@ fi # # %changelog -* Mon Jan 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.134] +* Tue Jan 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210126git13391c60da33.135] - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) - Turn off vdso_install for ppc (Justin M. Forbes) @@ -1,3 +1,3 @@ -SHA512 (linux-5.11-rc5.tar.xz) = e25e388e8a62d0ea94f380feb29083e320a3ba62fa227757d36d1976a98a539f2db96fe0dfff2437e0f6f35647afb09a86269b4d26732eab2525e6936827759c -SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.134.tar.bz2) = 33ee71451bcf259cbd01c207cf42f913a7fb66c7a27375e9deb85546c6fb829ed2b84ab2145c19a70240503f5a0078a95233beb5d73dccca78ff21b1310e3a38 -SHA512 (kernel-kabi-dw-5.11.0-0.rc5.134.tar.bz2) = d902dd592b98f59c6e15271056d6a4b3c7efc4ef44e615633de2744459f1b980f112468275bccc3ceb41b914143cbd9bd40e267425b93db82db5736930a105a8 +SHA512 (linux-20210126git13391c60da33.tar.xz) = 1bcef2ca961d43bf2886914bd414cf577cb529a8fe1a6b1bb4a96cf4635474450dc83f8ee63fcdf0a2422cb26bf45dce196d5cda6b93e59905bb9dc7329e58eb +SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210126git13391c60da33.135.tar.bz2) = 8c38e33078fcc3322210cd9900b060a76a7e909dec79d96423be0dbbad65c3e50a2400af682a297d5a36fb6fb54b71b7dc39d72be62128b8906c64f7d1b0ebef +SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210126git13391c60da33.135.tar.bz2) = 41ab644c57311a7c0bba0010fc313e536a28dd749247e60951d6669ccc853204064e78b4de3b4f9420ba7d27d61969575873344e60df923499fedd1873a2191a |