summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-06 20:42:16 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-06 20:42:16 +0100
commit1429580bfd405c147e4bde3a00b270b07b2e6c13 (patch)
tree5b4049bd5657007584c269325afeea490ed52c2e
parent889961e7d1825ddabd68eaa9ea87e8700cb14783 (diff)
parent4bdf8f6ab4722f4a976929b018b57029a197ffc7 (diff)
downloadkernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.gz
kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.tar.xz
kernel-1429580bfd405c147e4bde3a00b270b07b2e6c13.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git7.1.vanilla.knurd.1.fc30
Diffstat
-rw-r--r--arm64-tegra186-enable-USB-on-Jetson-TX2.patch51
-rw-r--r--configs/fedora/generic/arm/CONFIG_AMLOGIC_THERMAL1
-rw-r--r--configs/fedora/generic/arm/CONFIG_ARCH_S321
-rw-r--r--configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC1
-rw-r--r--configs/fedora/generic/arm/CONFIG_FSL_RCPM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MACH_MMP3_DT1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_TEGRA30_EMC1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug-fedora.config5
-rw-r--r--kernel-aarch64-fedora.config5
-rw-r--r--kernel-armv7hl-debug-fedora.config6
-rw-r--r--kernel-armv7hl-fedora.config6
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config6
-rw-r--r--kernel-armv7hl-lpae-fedora.config6
-rw-r--r--kernel.spec9
-rw-r--r--sources2
16 files changed, 47 insertions, 57 deletions
diff --git a/arm64-tegra186-enable-USB-on-Jetson-TX2.patch b/arm64-tegra186-enable-USB-on-Jetson-TX2.patch
deleted file mode 100644
index ea0287c2b..000000000
--- a/arm64-tegra186-enable-USB-on-Jetson-TX2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e5ccb943712d261b8ebb3e8ac92a82be4b244ce4 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 6 Oct 2019 14:44:25 +0100
-Subject: [PATCH] arm64: tegra186: enable USB on Jetson-TX2
-
-Based on the following patch series:
-https://www.spinics.net/lists/linux-tegra/msg44216.html
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++--
- arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
-index bdace01561ba..2e6195764268 100644
---- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
-+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
-@@ -115,7 +115,7 @@
- };
-
- padctl@3520000 {
-- status = "disabled";
-+ status = "okay";
-
- avdd-pll-erefeut-supply = <&vdd_1v8_pll>;
- avdd-usb-supply = <&vdd_3v3_sys>;
-@@ -193,7 +193,7 @@
- };
-
- usb@3530000 {
-- status = "disabled";
-+ status = "okay";
-
- phys = <&{/padctl@3520000/pads/usb2/lanes/usb2-0}>,
- <&{/padctl@3520000/pads/usb2/lanes/usb2-1}>,
-diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-index 47cd831fcf44..abdc81f555b9 100644
---- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
-@@ -525,6 +525,7 @@
- <0x0 0x03538000 0x0 0x1000>;
- reg-names = "hcd", "fpci";
-
-+ iommus = <&smmu TEGRA186_SID_XUSB_HOST>;
- interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
---
-2.21.0
-
diff --git a/configs/fedora/generic/arm/CONFIG_AMLOGIC_THERMAL b/configs/fedora/generic/arm/CONFIG_AMLOGIC_THERMAL
new file mode 100644
index 000000000..02ebb94c6
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_AMLOGIC_THERMAL
@@ -0,0 +1 @@
+CONFIG_AMLOGIC_THERMAL=m
diff --git a/configs/fedora/generic/arm/CONFIG_ARCH_S32 b/configs/fedora/generic/arm/CONFIG_ARCH_S32
new file mode 100644
index 000000000..8764fcd8b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_ARCH_S32
@@ -0,0 +1 @@
+# CONFIG_ARCH_S32 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC b/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC
new file mode 100644
index 000000000..b0f5dfb6f
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC
@@ -0,0 +1 @@
+# CONFIG_EXYNOS5422_DMC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_FSL_RCPM b/configs/fedora/generic/arm/CONFIG_FSL_RCPM
new file mode 100644
index 000000000..aab0d456e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_FSL_RCPM
@@ -0,0 +1 @@
+# CONFIG_FSL_RCPM is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MACH_MMP3_DT b/configs/fedora/generic/arm/CONFIG_MACH_MMP3_DT
new file mode 100644
index 000000000..70037090b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MACH_MMP3_DT
@@ -0,0 +1 @@
+# CONFIG_MACH_MMP3_DT is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TEGRA30_EMC b/configs/fedora/generic/arm/armv7/CONFIG_TEGRA30_EMC
new file mode 100644
index 000000000..ad808ee3c
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_TEGRA30_EMC
@@ -0,0 +1 @@
+CONFIG_TEGRA30_EMC=y
diff --git a/gitrev b/gitrev
index 11a31d2d2..301125f97 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-2f13437b8917627119d163d62f73e7a78a92303a
+b0d4beaa5a4b7d31070c41c2e50740304a3f1138
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 300d92da2..6a94e631b 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -205,6 +205,7 @@ CONFIG_AMD_PHY=m
CONFIG_AMD_XGBE_DCB=y
CONFIG_AMD_XGBE=m
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -261,6 +262,7 @@ CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_SA1100 is not set
CONFIG_ARCH_SEATTLE=y
@@ -1809,6 +1811,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
@@ -1974,6 +1977,7 @@ CONFIG_FSL_MC_DPIO=m
CONFIG_FSL_PQ_MDIO=m
CONFIG_FSL_QDMA=m
# CONFIG_FSL_QMAN_TEST is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3211,6 +3215,7 @@ CONFIG_MACB=m
CONFIG_MACB_PCI=m
CONFIG_MACB_USE_HWSTAMP=y
CONFIG_MAC_EMUMOUSEBTN=y
+# CONFIG_MACH_MMP3_DT is not set
CONFIG_MACHZ_WDT=m
CONFIG_MAC_PARTITION=y
CONFIG_MACSEC=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 9824af89c..4a6e64c99 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -205,6 +205,7 @@ CONFIG_AMD_PHY=m
CONFIG_AMD_XGBE_DCB=y
CONFIG_AMD_XGBE=m
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -261,6 +262,7 @@ CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_SA1100 is not set
CONFIG_ARCH_SEATTLE=y
@@ -1801,6 +1803,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_F2FS_CHECK_FS is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
@@ -1958,6 +1961,7 @@ CONFIG_FSL_MC_DPIO=m
CONFIG_FSL_PQ_MDIO=m
CONFIG_FSL_QDMA=m
# CONFIG_FSL_QMAN_TEST is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3193,6 +3197,7 @@ CONFIG_MACB=m
CONFIG_MACB_PCI=m
CONFIG_MACB_USE_HWSTAMP=y
CONFIG_MAC_EMUMOUSEBTN=y
+# CONFIG_MACH_MMP3_DT is not set
CONFIG_MACHZ_WDT=m
CONFIG_MAC_PARTITION=y
CONFIG_MACSEC=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 39b542318..46f1d3cfe 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -179,6 +179,7 @@ CONFIG_AMD8111_ETH=m
CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
@@ -253,6 +254,7 @@ CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_SA1100 is not set
@@ -1832,6 +1834,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1983,6 +1986,7 @@ CONFIG_FSL_ENETC_QOS=y
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3246,6 +3250,7 @@ CONFIG_MACH_DOVE=y
# CONFIG_MACH_MESON6 is not set
# CONFIG_MACH_MESON8 is not set
CONFIG_MACH_MMP2_DT=y
+# CONFIG_MACH_MMP3_DT is not set
# CONFIG_MACH_OMAP3517EVM is not set
# CONFIG_MACH_OMAP3_PANDORA is not set
CONFIG_MACH_STM32MP157=y
@@ -6638,6 +6643,7 @@ CONFIG_TEE=m
CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_EMC=y
+CONFIG_TEGRA30_EMC=y
CONFIG_TEGRA_AHB=y
# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index a0535e7bc..065a0c878 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -179,6 +179,7 @@ CONFIG_AMD8111_ETH=m
CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
@@ -253,6 +254,7 @@ CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_SA1100 is not set
@@ -1825,6 +1827,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1968,6 +1971,7 @@ CONFIG_FSL_ENETC_QOS=y
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3229,6 +3233,7 @@ CONFIG_MACH_DOVE=y
# CONFIG_MACH_MESON6 is not set
# CONFIG_MACH_MESON8 is not set
CONFIG_MACH_MMP2_DT=y
+# CONFIG_MACH_MMP3_DT is not set
# CONFIG_MACH_OMAP3517EVM is not set
# CONFIG_MACH_OMAP3_PANDORA is not set
CONFIG_MACH_STM32MP157=y
@@ -6617,6 +6622,7 @@ CONFIG_TEE=m
CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_EMC=y
+CONFIG_TEGRA30_EMC=y
CONFIG_TEGRA_AHB=y
# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f34051e37..a9923e11b 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -177,6 +177,7 @@ CONFIG_AMD8111_ETH=m
CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -244,6 +245,7 @@ CONFIG_ARCH_MVEBU=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_SA1100 is not set
@@ -1771,6 +1773,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1922,6 +1925,7 @@ CONFIG_FSL_ENETC_QOS=y
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3150,6 +3154,7 @@ CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
# CONFIG_MACH_MESON6 is not set
# CONFIG_MACH_MESON8 is not set
+# CONFIG_MACH_MMP3_DT is not set
CONFIG_MACH_STM32MP157=y
# CONFIG_MACH_SUN4I is not set
# CONFIG_MACH_SUN5I is not set
@@ -6325,6 +6330,7 @@ CONFIG_TCS3472=m
CONFIG_TEE=m
CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TEGRA30_EMC=y
CONFIG_TEGRA_AHB=y
# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index f2b62c755..e2cac8611 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -177,6 +177,7 @@ CONFIG_AMD8111_ETH=m
CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMLOGIC_THERMAL=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -244,6 +245,7 @@ CONFIG_ARCH_MVEBU=y
# CONFIG_ARCH_RENESAS is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_S3C24XX is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_SA1100 is not set
@@ -1764,6 +1766,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_EXYNOS5422_DMC is not set
CONFIG_EXYNOS_ADC=m
CONFIG_EXYNOS_AUDSS_CLK_CON=m
# CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1907,6 +1910,7 @@ CONFIG_FSL_ENETC_QOS=y
# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
+# CONFIG_FSL_RCPM is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
@@ -3133,6 +3137,7 @@ CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
# CONFIG_MACH_MESON6 is not set
# CONFIG_MACH_MESON8 is not set
+# CONFIG_MACH_MMP3_DT is not set
CONFIG_MACH_STM32MP157=y
# CONFIG_MACH_SUN4I is not set
# CONFIG_MACH_SUN5I is not set
@@ -6304,6 +6309,7 @@ CONFIG_TCS3472=m
CONFIG_TEE=m
CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TEGRA30_EMC=y
CONFIG_TEGRA_AHB=y
# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
diff --git a/kernel.spec b/kernel.spec
index 447ce3a23..9bb7ec893 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -112,7 +112,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -474,7 +474,7 @@ Summary: The Linux kernel
# We only build kernel-headers on the following...
%if 0%{?fedora}
-%define nobuildarches i386 ppc64le
+%define nobuildarches i386
%else
%define nobuildarches i386 i686
%endif
@@ -836,8 +836,6 @@ Patch305: ARM-tegra-usb-no-reset.patch
Patch320: arm64-tegra-jetson-tx1-fixes.patch
# https://www.spinics.net/lists/linux-tegra/msg43110.html
Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
-# https://www.spinics.net/lists/linux-tegra/msg44216.html
-Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch
# 400 - IBM (ppc/s390x) patches
@@ -2909,6 +2907,9 @@ fi
#
#
%changelog
+* Fri Dec 06 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git7.1
+- Linux v5.4-12941-gb0d4beaa5a4b
+
* Thu Dec 05 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc0.git6.1
- Linux v5.4-11747-g2f13437b8917
diff --git a/sources b/sources
index 5b14b40a3..d053fbc93 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-SHA512 (patch-5.4-git6.xz) = e3bfdb31b338767b81dbc1a925a87e7c72d76b5c6c233c52044af92cda84e50a5480117e5701ff749fb4c8e738f3eff00a1ac14f66c960a3f9328443d700934d
+SHA512 (patch-5.4-git7.xz) = 915f14ae30e7d7dc238ac8f90e95ceba5c56c9c356e7d88bfbc9acaf61b0d34347a10ebdd9d0fa6a91ca8715efdc5c1f41406dae2a986d79c9236d696f29c89b
generated by cgit (git 2.34.1) at 2024-05-01 18:04:20 +0000