From f225911f0c94c3a638800b304f7fc9e6e216a6f1 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 10 Dec 2019 09:16:42 -0500 Subject: Revert "Goodbye CONFIG_AX25" This reverts commit e3676c312d6ce5efd03da004aef14a0cdb3b6f56. Turns out I cannot read and this is not the correct option. --- configs/fedora/generic/CONFIG_AX25 | 2 +- kernel-aarch64-debug-fedora.config | 3 ++- kernel-aarch64-fedora.config | 3 ++- kernel-armv7hl-debug-fedora.config | 3 ++- kernel-armv7hl-fedora.config | 3 ++- kernel-armv7hl-lpae-debug-fedora.config | 3 ++- kernel-armv7hl-lpae-fedora.config | 3 ++- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 15 files changed, 21 insertions(+), 15 deletions(-) diff --git a/configs/fedora/generic/CONFIG_AX25 b/configs/fedora/generic/CONFIG_AX25 index bc6101574..2838a653a 100644 --- a/configs/fedora/generic/CONFIG_AX25 +++ b/configs/fedora/generic/CONFIG_AX25 @@ -1 +1 @@ -# CONFIG_AX25 is not set +CONFIG_AX25=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4044702e8..28254cdc7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_AXI_DMAC=m CONFIG_AXP20X_ADC=m @@ -4842,6 +4842,7 @@ CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_QCOM_LLCC=m CONFIG_QCOM_MDT_LOADER=m +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_Q6V5_ADSP=m CONFIG_QCOM_Q6V5_MSS=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 661ef6843..8249c6f61 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_AXI_DMAC=m CONFIG_AXP20X_ADC=m @@ -4821,6 +4821,7 @@ CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_QCOM_LLCC=m CONFIG_QCOM_MDT_LOADER=m +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_Q6V5_ADSP=m CONFIG_QCOM_Q6V5_MSS=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 754209543..cc709585f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796_93CX6=y CONFIG_AX88796B_PHY=m CONFIG_AX88796=m @@ -4929,6 +4929,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA_MGMT is not set CONFIG_QCOM_IOMMU=y # CONFIG_QCOM_LLCC is not set +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 6ac7b14d5..76ce11adf 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796_93CX6=y CONFIG_AX88796B_PHY=m CONFIG_AX88796=m @@ -4909,6 +4909,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA_MGMT is not set CONFIG_QCOM_IOMMU=y # CONFIG_QCOM_LLCC is not set +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index f33973b77..afe55162f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796_93CX6=y CONFIG_AX88796B_PHY=m CONFIG_AX88796=m @@ -4737,6 +4737,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_LLCC is not set +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_RMTFS_MEM=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 526ea28a4..884d35185 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796_93CX6=y CONFIG_AX88796B_PHY=m CONFIG_AX88796=m @@ -4717,6 +4717,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_LLCC is not set +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_RMTFS_MEM=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 9a5a07a24..2762ea22d 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -344,7 +344,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 01da40bdf..78b7577b5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -343,7 +343,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a01242b5e..ba79b178d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -284,7 +284,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 569dc7eff..d33dfbc25 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -283,7 +283,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1f1cddad0..bc424312b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -288,7 +288,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y # CONFIG_AUXDISPLAY is not set CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 3b1d283d7..c192e4f26 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -287,7 +287,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y # CONFIG_AUXDISPLAY is not set CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 9b6278cef..48b89c3d4 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -347,7 +347,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m # CONFIG_AXP20X_ADC is not set # CONFIG_AXP20X_POWER is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d6f3fbf68..a28baaadc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -346,7 +346,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m # CONFIG_AXP20X_ADC is not set # CONFIG_AXP20X_POWER is not set -- cgit From ca5cc27a356dc416db8a5381156de03c41743c38 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 10 Dec 2019 10:54:47 -0600 Subject: Linux v5.5-rc1-12-g6794862a16ef --- gitrev | 2 +- kernel.spec | 8 ++++++-- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 65a384fe6..866cdb8e3 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -e42617b825f8073569da76dc4510bfa019b1c35a +6794862a16ef41f753abd75c03a152836e4c8028 diff --git a/kernel.spec b/kernel.spec index 6a77896ae..09192507c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,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 @@ -197,7 +197,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 @@ -2890,6 +2890,10 @@ fi # # %changelog +* Tue Dec 10 2019 Justin M. Forbes - 5.5.0-0.rc1.git1.1 +- Linux v5.5-rc1-12-g6794862a16ef +- Reenable debugging options. + * Mon Dec 09 2019 Justin M. Forbes - 5.5.0-0.rc1.git0.1 - Linux v5.5-rc1 diff --git a/sources b/sources index 55898b335..61aaacd27 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f SHA512 (patch-5.5-rc1.xz) = 151d993746f5947827617468b79541f8376502f9ad2285b675f4e4464dfd427e5874a2a9976af1fa9867ac1728c9fda13cad85ac810e12b1fc039a9b2ee5a174 +SHA512 (patch-5.5-rc1-git1.xz) = 97d198330e8f8958db09e5503e4ab9ddb1eafe529f4c23df19babdac04d573c272472bbece5b7088630d11facd6dd08c366ccc6fc0fb285ff7bd7dfb255f1be2 -- cgit From 3cdb1db179700bb87f57c3b545772d31485c5923 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 10 Dec 2019 11:42:32 -0600 Subject: Convert pr_warning to pr_warn --- efi-secureboot.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efi-secureboot.patch b/efi-secureboot.patch index c7250e47f..cda57a471 100644 --- a/efi-secureboot.patch +++ b/efi-secureboot.patch @@ -205,7 +205,7 @@ index 000000000000..9070055de0a1 + pr_info("Secure boot enabled\n"); + break; + default: -+ pr_warning("Secure boot could not be determined (mode %u)\n", ++ pr_warn("Secure boot could not be determined (mode %u)\n", + mode); + break; + } -- cgit