diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-12 05:54:09 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-12 05:54:09 +0100 |
commit | 30d2ec9553d88d00b7ab21cf4b53e62d2588ea9d (patch) | |
tree | a830f94837b985de955e0c8edb5cc129d7220c96 | |
parent | 72215e11f3849047730df224b7873d2caa81fe42 (diff) | |
parent | 50e397c274e2cde9e0b7b07883029ddfb2c9381c (diff) | |
download | kernel-30d2ec9553d88d00b7ab21cf4b53e62d2588ea9d.tar.gz kernel-30d2ec9553d88d00b7ab21cf4b53e62d2588ea9d.tar.xz kernel-30d2ec9553d88d00b7ab21cf4b53e62d2588ea9d.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE | 1 | ||||
-rw-r--r-- | configs/fedora/generic/x86/CONFIG_SFI | 2 | ||||
-rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_INTEL_MPX | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 4 | ||||
-rw-r--r-- | kernel-i686-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 3 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 3 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 3 | ||||
-rw-r--r-- | kernel.spec | 10 | ||||
-rw-r--r-- | sources | 1 |
13 files changed, 19 insertions, 19 deletions
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST deleted file mode 100644 index 416bd56df..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCIE_ROCKCHIP_HOST=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE deleted file mode 100644 index 20fb6074b..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PHY_ROCKCHIP_PCIE=m diff --git a/configs/fedora/generic/x86/CONFIG_SFI b/configs/fedora/generic/x86/CONFIG_SFI index 4754983e1..6857591ec 100644 --- a/configs/fedora/generic/x86/CONFIG_SFI +++ b/configs/fedora/generic/x86/CONFIG_SFI @@ -1 +1 @@ -CONFIG_SFI=y +# CONFIG_SFI is not set diff --git a/configs/fedora/generic/x86/CONFIG_X86_INTEL_MPX b/configs/fedora/generic/x86/CONFIG_X86_INTEL_MPX deleted file mode 100644 index ed1a6daeb..000000000 --- a/configs/fedora/generic/x86/CONFIG_X86_INTEL_MPX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_X86_INTEL_MPX=y @@ -1 +1 @@ -90568ecf561540fa330511e21fcd823b0c3829c6 +0a679e13ea30f85a1aef0669ee0c5a9fd7860b34 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 52ca6b586..7e868fd2a 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4541,7 +4541,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_ROCKCHIP_HOST is not set CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4640,7 +4640,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_PCIE is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d32f533f1..81fe4a78a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4521,7 +4521,7 @@ CONFIG_PCIE_KIRIN=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y -CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_ROCKCHIP_HOST is not set CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y @@ -4620,7 +4620,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_PCIE is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index a92494059..2bc45f175 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5227,7 +5227,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6787,7 +6787,6 @@ CONFIG_X86_GENERIC=y # CONFIG_X86_GX_SUSPMOD is not set CONFIG_X86_INTEL_LPSS=y # CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 2de59634a..bc7125313 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5207,7 +5207,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6766,7 +6766,6 @@ CONFIG_X86_GENERIC=y # CONFIG_X86_GX_SUSPMOD is not set CONFIG_X86_INTEL_LPSS=y # CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_QUARK is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 44f4914b6..d56407850 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5275,7 +5275,7 @@ CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set @@ -6842,7 +6842,6 @@ CONFIG_X86_GENERIC=y CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_X86_INTEL_TSX_MODE_OFF=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 94b2c45ed..7daf568cf 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5255,7 +5255,7 @@ CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y -CONFIG_SFI=y +# CONFIG_SFI is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set @@ -6821,7 +6821,6 @@ CONFIG_X86_GENERIC=y CONFIG_X86_INTEL_LPSS=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_MID is not set -CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_PSTATE=y # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_X86_INTEL_TSX_MODE_OFF=y diff --git a/kernel.spec b/kernel.spec index 2d07b592b..5d6d7e8f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -208,7 +208,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 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -2910,6 +2910,12 @@ fi # # %changelog +* Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git1.1 +- Linux v5.6-rc1-5-g0a679e13ea30 + +* Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + * Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com> - Remove sysrq support to lift lockdown (rhbz 1800859) @@ -1,2 +1,3 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 SHA512 (patch-5.6-rc1.xz) = 14a250e7128fa5e72f077e8751d3aa759ed03f102405359445748765542da1d0afae90bf69e02526cbf003395114b546c716ffd93d0e230e5da3b088f6d4b573 +SHA512 (patch-5.6-rc1-git1.xz) = 16b771bbf7ae6e600a6d948d4849b3f54eb5cbad26a5d720c48270e47b2a895064da820a671f3177b81f21fbb36dad42e2f50daa319333bae4c19736268eba96 |