diff options
-rw-r--r-- | configs/fedora/generic/CONFIG_OF_PMEM | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
-rw-r--r-- | kernel-aarch64.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl.config | 2 | ||||
-rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
-rw-r--r-- | kernel-i686-debug.config | 2 | ||||
-rw-r--r-- | kernel-i686.config | 2 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
-rw-r--r-- | kernel-x86_64.config | 2 | ||||
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | sources | 3 |
22 files changed, 26 insertions, 24 deletions
diff --git a/configs/fedora/generic/CONFIG_OF_PMEM b/configs/fedora/generic/CONFIG_OF_PMEM index 1099fba70..71309bbab 100644 --- a/configs/fedora/generic/CONFIG_OF_PMEM +++ b/configs/fedora/generic/CONFIG_OF_PMEM @@ -1 +1 @@ -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m @@ -1 +1 @@ -43f70c960180c11d64ee3e9e53075fe1acd43ff1 +6d08b06e67cd117f6992c46611dfb4ce267cd71e diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4871044c2..a5e4762b0 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4014,7 +4014,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index cb85a35e0..9ec457e8c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3992,7 +3992,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 6eeeb1e45..07638ed25 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4230,7 +4230,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 022fbf9cd..45ca168cb 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4047,7 +4047,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0a4361b57..1cbfe127f 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4025,7 +4025,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index ff7f413ba..459d5113c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4208,7 +4208,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 0d1336824..4bd00a3e4 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3827,7 +3827,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_XO15_SCI=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index ea83c8d92..51237fbf2 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3848,7 +3848,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_XO15_SCI=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index ac8bf13e1..73abadf08 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3848,7 +3848,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_XO15_SCI=y diff --git a/kernel-i686.config b/kernel-i686.config index 479e78b80..9893cb666 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3827,7 +3827,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set CONFIG_OF=y CONFIG_OLPC_XO15_SCI=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index ef1713420..d18e99dad 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3661,7 +3661,7 @@ CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCXL=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set # CONFIG_OMFS_FS is not set CONFIG_OPAL_PRD=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 3fd28437a..1e86c3859 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3638,7 +3638,7 @@ CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCXL=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set # CONFIG_OMFS_FS is not set CONFIG_OPAL_PRD=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index e3452e082..6118269bc 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3605,7 +3605,7 @@ CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCXL=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set # CONFIG_OMFS_FS is not set CONFIG_OPAL_PRD=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 1ceeccc9e..3f6efcbd5 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3582,7 +3582,7 @@ CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCXL=m # CONFIG_OF_OVERLAY is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OF_UNITTEST is not set # CONFIG_OMFS_FS is not set CONFIG_OPAL_PRD=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 75eccd295..d17179af3 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3541,7 +3541,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m diff --git a/kernel-s390x.config b/kernel-s390x.config index ae4361772..2fb107362 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3518,7 +3518,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index de92d86ab..38583172b 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3910,7 +3910,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 710a89eeb..54cfebb3d 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3889,7 +3889,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m diff --git a/kernel.spec b/kernel.spec index 539f6f6cb..9ee1b52b0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 1 +%global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1872,6 +1872,9 @@ fi # # %changelog +* Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git0.1 +- Linux v4.17-rc2 + * Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org> - Disable debugging options. @@ -1,3 +1,2 @@ SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 -SHA512 (patch-4.17-rc1.xz) = a66f90c43b2855142711e80f2df61366bdb5dbe0ed257f549b36bb173f5f24fa87b6293ac284d00cb3c92f5708dbed5214313f8a31c6a98fa5cad29db9d4ad25 -SHA512 (patch-4.17-rc1-git3.xz) = b7b9cda1493e3598eb03f0c24170ce42576d4e2958f316710d3a17854b6c3ee312919e3b7bd19a9bedf9e750dbe4319c43409b3c57d5e77ab5bb0c830824b75c +SHA512 (patch-4.17-rc2.xz) = 9456b16b16dc389b7f53cef01078b537557bbf28fb3a0ce286fbfef1605eb498c966dd98cff9e98eb772598c39b2e62643b3ef591112dbb8eb2ec06cbd18c7c6 |