diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-10 06:49:24 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-10 06:49:24 +0100 |
| commit | c0d2d01cf5f4ca81c26065c38f9fae198e075ed4 (patch) | |
| tree | 06b75775958c244a4372c577a97027ba036c4a04 | |
| parent | e3912fb8f52caada98ad6f013858eca580d982ad (diff) | |
| parent | ec5e1b2e89c4ec941b263bf53b6573131ae23e33 (diff) | |
| download | kernel-c0d2d01cf5f4ca81c26065c38f9fae198e075ed4.tar.gz kernel-c0d2d01cf5f4ca81c26065c38f9fae198e075ed4.tar.xz kernel-c0d2d01cf5f4ca81c26065c38f9fae198e075ed4.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc5.git2.1.vanilla.knurd.1.fc31
24 files changed, 111 insertions, 18 deletions
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS b/configs/fedora/generic/CONFIG_EROFS_FS index 4bdace556..0394e57c2 100644 --- a/configs/fedora/generic/CONFIG_EROFS_FS +++ b/configs/fedora/generic/CONFIG_EROFS_FS @@ -1 +1 @@ -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS=m diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT new file mode 100644 index 000000000..585602e4a --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT @@ -0,0 +1 @@ +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG new file mode 100644 index 000000000..5363c0f0a --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG @@ -0,0 +1 @@ +# CONFIG_EROFS_FS_DEBUG is not set diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL new file mode 100644 index 000000000..fe4f9a826 --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL @@ -0,0 +1 @@ +CONFIG_EROFS_FS_POSIX_ACL=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY new file mode 100644 index 000000000..f24b07262 --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY @@ -0,0 +1 @@ +CONFIG_EROFS_FS_SECURITY=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_XATTR b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR new file mode 100644 index 000000000..751034acd --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR @@ -0,0 +1 @@ +CONFIG_EROFS_FS_XATTR=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_ZIP b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP new file mode 100644 index 000000000..fe558502b --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP @@ -0,0 +1 @@ +CONFIG_EROFS_FS_ZIP=y @@ -1 +1 @@ -b07f636fca1c8fbba124b0082487c0b3890a0e0c +e69ec487b2c7c82ef99b4b15122f58a2a99289a3 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index abaa7be5b..2400460c1 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1779,7 +1779,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index cca6b1044..354c2978a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1771,7 +1771,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 6e1533d41..ff057c577 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1805,7 +1805,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a125864d4..33c099088 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1798,7 +1798,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1b1aa2a5d..f9d290319 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1757,7 +1757,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index c89cc0c23..c2df2bb7f 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1750,7 +1750,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 4cadd5b3c..1e283b782 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1515,7 +1515,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index dcd44528b..7fac39dc3 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1506,7 +1506,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 01a13d8c4..11e4e59bd 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1376,7 +1376,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 92f68e4c6..08e26c67c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1367,7 +1367,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0cf5397dc..3ea9bba6a 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1384,7 +1384,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b5da410cb..8fa117548 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1375,7 +1375,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 38bafb00d..05d5e24c7 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1555,7 +1555,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b5a79015f..270c227d5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1546,7 +1546,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel.spec b/kernel.spec index 6492f3c94..a2e3b0209 100644 --- a/kernel.spec +++ b/kernel.spec @@ -112,7 +112,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2909,6 +2909,9 @@ fi # # %changelog +* Thu Jan 09 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc5.git2.1 +- Linux v5.5-rc5-134-ge69ec487b2c7 + * Wed Jan 08 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc5.git1.1 - Linux v5.5-rc5-41-gb07f636fca1c - Reenable debugging options. @@ -1,3 +1,3 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f SHA512 (patch-5.5-rc5.xz) = 846bc529a7f05a130fd2f02e429f8f8818cb47a9b9074060203e1f2b533e31a6d4edc42163b27091a26774449a51823c3f44c2d50b55abef5c059b5382be86a7 -SHA512 (patch-5.5-rc5-git1.xz) = 8ddc78672146a7ea68334bd5c9dd494362aefe017955ef2ec9fa7c921450382f0d0f00f0761adc38f979d8fab288fb224bf65bc636d4529fe12d957295adb721 +SHA512 (patch-5.5-rc5-git2.xz) = 7c3ce522361c174fd6702bf992b17032473da5aa92ffb903916e2eb12d18a2e56fc202187b0357180f74f0bd7f6089474a1896c4897ece071d0543165f1a7bf4 |