From 5c2aa86a1d87d74aeb3969f57626fa565f8db670 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 1 Aug 2019 07:46:22 -0400 Subject: Linux v5.3-rc2-60-g5c6207539aea Enable 8250 serial ports --- configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 | 1 - configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE | 1 - gitrev | 2 +- kernel-ppc64le-debug.config | 4 ++-- kernel-ppc64le.config | 4 ++-- kernel.spec | 8 ++++++-- sources | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 delete mode 100644 configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE diff --git a/configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 b/configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 deleted file mode 100644 index 4dd74a78b..000000000 --- a/configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SERIAL_8250 is not set diff --git a/configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE b/configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE deleted file mode 100644 index 32ecde504..000000000 --- a/configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SERIAL_CORE=m diff --git a/gitrev b/gitrev index 40c2c95a2..06f7c53c3 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -4010b622f1d2a6112244101f38225eaee20c07f2 +5c6207539aea8b22490f9569db5aa72ddfd0d486 diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index f0c986d85..affa6297b 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4696,7 +4696,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -# CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_MOXA=m @@ -4706,13 +4705,14 @@ CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RUNTIME_UARTS=32 CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250=y # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_CORE=m +CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y # CONFIG_SERIAL_FSL_LPUART is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index f2f7209f2..06d7c62bb 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4674,7 +4674,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -# CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_MID is not set CONFIG_SERIAL_8250_MOXA=m @@ -4684,13 +4683,14 @@ CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_RUNTIME_UARTS=32 CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250=y # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_CORE=m +CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y # CONFIG_SERIAL_FSL_LPUART is not set diff --git a/kernel.spec b/kernel.spec index aa29c144b..6c2532ee2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -71,7 +71,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1820,6 +1820,10 @@ fi # # %changelog +* Thu Aug 01 2019 Laura Abbott - 5.3.0-0.rc2.git3.1 +- Linux v5.3-rc2-60-g5c6207539aea +- Enable 8250 serial ports on powerpc + * Wed Jul 31 2019 Peter Robinson 5.3.0-0.rc2.git2.2 - Enable IMA Appraisal diff --git a/sources b/sources index 4d2350b9a..79419ca3c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c SHA512 (patch-5.3-rc2.xz) = 24691c1f8ccbea442d8d4e828be73c726328e50c24b4a8a07879397b939339cad00f85560781ad1d36158e022db1e5900308c091e9f453ebbe28fa23cf8b2cbe -SHA512 (patch-5.3-rc2-git2.xz) = a5e0222a440ce3f71fb083690958908e3a72383f053c0e1f6b8412859a648a9041236dbec4ae95aae2638665552cb2253337f86372af015ad1a5da9614efcd68 +SHA512 (patch-5.3-rc2-git3.xz) = f1d820059ffbb16242e84534757747e2a3e3ad012163ff650898a6d01ca8e7485934c425c07c6679386d4521be58350df911fce0bd2b69e841311d42c278d581 -- cgit