diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-01 17:50:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-08-01 17:50:22 +0200 |
commit | 63a3c1c2d41ac5be01713073fd13dbbb6cccc0d8 (patch) | |
tree | 29f8d453aa602401a8be0b109116e37e8abdca98 | |
parent | cc21a9baeb40f98f802c0aa807a2f7c70a060472 (diff) | |
parent | 5c2aa86a1d87d74aeb3969f57626fa565f8db670 (diff) | |
download | kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.tar.gz kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.tar.xz kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc2.git3.1.vanilla.knurd.1.fc29
-rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175_EC | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_SYSTEM_CONTROL | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_TIME | 1 | ||||
-rw-r--r-- | configs/fedora/generic/powerpc/CONFIG_SERIAL_8250 | 1 | ||||
-rw-r--r-- | configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 5 | ||||
-rw-r--r-- | kernel-armv7hl.config | 5 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le.config | 4 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
13 files changed, 24 insertions, 12 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175_EC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175_EC new file mode 100644 index 000000000..0fd00686e --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175_EC @@ -0,0 +1 @@ +CONFIG_OLPC_XO175_EC=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE new file mode 100644 index 000000000..1f9d4021b --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE @@ -0,0 +1 @@ +CONFIG_SPI_SLAVE=y diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_SYSTEM_CONTROL b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_SYSTEM_CONTROL new file mode 100644 index 000000000..417ab9265 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_SYSTEM_CONTROL @@ -0,0 +1 @@ +# CONFIG_SPI_SLAVE_SYSTEM_CONTROL is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_TIME b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_TIME new file mode 100644 index 000000000..d051f8e10 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_SLAVE_TIME @@ -0,0 +1 @@ +# CONFIG_SPI_SLAVE_TIME is not set 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 @@ -1 +1 @@ -4010b622f1d2a6112244101f38225eaee20c07f2 +5c6207539aea8b22490f9569db5aa72ddfd0d486 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 30139328b..453522938 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4321,6 +4321,7 @@ CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_EC=y +CONFIG_OLPC_XO175_EC=m CONFIG_OLPC_XO175=y # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP2_DSS_DEBUG is not set @@ -6294,7 +6295,9 @@ CONFIG_SPI_ROCKCHIP=m CONFIG_SPI_S3C64XX=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set -# CONFIG_SPI_SLAVE is not set +# CONFIG_SPI_SLAVE_SYSTEM_CONTROL is not set +# CONFIG_SPI_SLAVE_TIME is not set +CONFIG_SPI_SLAVE=y CONFIG_SPI_SPIDEV=m CONFIG_SPI_STM32=m CONFIG_SPI_STM32_QSPI=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 62e006001..dad93ec85 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4302,6 +4302,7 @@ CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_EC=y +CONFIG_OLPC_XO175_EC=m CONFIG_OLPC_XO175=y # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP2_DSS_DEBUG is not set @@ -6273,7 +6274,9 @@ CONFIG_SPI_ROCKCHIP=m CONFIG_SPI_S3C64XX=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set -# CONFIG_SPI_SLAVE is not set +# CONFIG_SPI_SLAVE_SYSTEM_CONTROL is not set +# CONFIG_SPI_SLAVE_TIME is not set +CONFIG_SPI_SLAVE=y CONFIG_SPI_SPIDEV=m CONFIG_SPI_STM32=m CONFIG_SPI_STM32_QSPI=m 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 67a14bb11..25795b30b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -46,7 +46,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 @@ -79,7 +79,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 @@ -1840,6 +1840,10 @@ fi # # %changelog +* Thu Aug 01 2019 Laura Abbott <labbott@redhat.com> - 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 <pbrobinson@fedoraproject.org> 5.3.0-0.rc2.git2.2 - Enable IMA Appraisal @@ -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 |