diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-26 14:48:15 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-26 14:48:15 +0200 |
commit | 8e2ea7a848df6d5983e69c49f36e3e152c7ec190 (patch) | |
tree | 8392e45b7e74db173b09bf24de4d8c52d71414cf | |
parent | 32580b1878578ea9e4efb4a51b828ff140a20fcd (diff) | |
parent | 5feabf6fff5ac81f5095449418558ac395f7929e (diff) | |
download | kernel-8e2ea7a848df6d5983e69c49f36e3e152c7ec190.tar.gz kernel-8e2ea7a848df6d5983e69c49f36e3e152c7ec190.tar.xz kernel-8e2ea7a848df6d5983e69c49f36e3e152c7ec190.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc1.git4.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc1.git4.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc1.git4.1.vanilla.knurd.1.fc29
-rw-r--r-- | configs/fedora/generic/CONFIG_IMA_KEXEC | 1 | ||||
-rw-r--r-- | configs/fedora/generic/powerpc/CONFIG_NVRAM | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel.spec | 6 | ||||
-rw-r--r-- | sources | 2 |
7 files changed, 11 insertions, 5 deletions
diff --git a/configs/fedora/generic/CONFIG_IMA_KEXEC b/configs/fedora/generic/CONFIG_IMA_KEXEC new file mode 100644 index 000000000..cd3248a5e --- /dev/null +++ b/configs/fedora/generic/CONFIG_IMA_KEXEC @@ -0,0 +1 @@ +CONFIG_IMA_KEXEC=y diff --git a/configs/fedora/generic/powerpc/CONFIG_NVRAM b/configs/fedora/generic/powerpc/CONFIG_NVRAM new file mode 100644 index 000000000..a296f9134 --- /dev/null +++ b/configs/fedora/generic/powerpc/CONFIG_NVRAM @@ -0,0 +1 @@ +CONFIG_NVRAM=y @@ -1 +1 @@ -bed38c3e2dca01b358a62b5e73b46e875742fd75 +6789f873ed373319cbf83b56455baf00769bb79a diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 5bb309d73..988f2f0eb 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3630,7 +3630,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVM is not set -# CONFIG_NVRAM is not set +CONFIG_NVRAM=y # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index d1118e8b0..6dc2a1191 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3609,7 +3609,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVM is not set -# CONFIG_NVRAM is not set +CONFIG_NVRAM=y # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_MASKLOG is not set diff --git a/kernel.spec b/kernel.spec index 295648edd..d08cc6fdc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1842,6 +1842,10 @@ fi # # %changelog +* Fri Jul 26 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc1.git4.1 +- Linux v5.3-rc1-96-g6789f873ed37 +- Enable nvram driver (rhbz 1732612) + * Thu Jul 25 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc1.git3.1 - Linux v5.3-rc1-82-gbed38c3e2dca @@ -1,3 +1,3 @@ SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c SHA512 (patch-5.3-rc1.xz) = 2516824ccc1da39a5b86a8c5fc5db6327e3d0ff71ba0d913b7b05ad145103bd92a0936f46adf49884ed78eed76c306b578f34596ceca2f2f0120fc4b119c1c96 -SHA512 (patch-5.3-rc1-git3.xz) = 01540558244cb21869fe5150a9675dc0a5671b19769924f32d8330cfbc4395a653048b024f5373862aa53e52f7d335966b4daf7634b2fc9e3060d03cd063cfbc +SHA512 (patch-5.3-rc1-git4.xz) = 8cdf57434a5f5fdb824053097bf3e1b5e59a3e0e8a737d66dc938fc205636d47f3bcb7695bd747e3d735f90e623d97eb60b7fa8668694c98a1c6a0f8028146f5 |