summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-02-23 10:44:08 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-02-23 10:44:08 -0600
commitb2e587e3a7fb8acf134befd1eb577f30664f724d (patch)
tree31b5b920969f9a928b5773835c5d9ab3a7d1bbe7
parentd2434da7a517730e74e0abe414819e2b8fb6b699 (diff)
downloadkernel-b2e587e3a7fb8acf134befd1eb577f30664f724d.tar.gz
kernel-b2e587e3a7fb8acf134befd1eb577f30664f724d.tar.xz
kernel-b2e587e3a7fb8acf134befd1eb577f30664f724d.zip
kernel-5.16.11-0
* Wed Feb 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.11-0] - spec: don't overwrite auto.conf with .config (Ondrej Mosnacek) - New configs for 5.16.10 (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-fedora.config1
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-fedora.config1
-rwxr-xr-xkernel.spec22
-rw-r--r--patch-5.16-redhat.patch18
-rw-r--r--sources6
17 files changed, 37 insertions, 23 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 9e5b31f71..9a57bf36d 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -7632,6 +7632,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 86cd26154..f0312511b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -7606,6 +7606,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 0f277836d..73ea8ba08 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -7838,6 +7838,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 07e6f4a27..c8301f9a4 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -7813,6 +7813,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 93afddbf0..7fb72f5b9 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -7606,6 +7606,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 558ba9e95..7b9043dbb 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -7581,6 +7581,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
CONFIG_TSL4531=m
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index c764adfd9..0522671e0 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -6855,6 +6855,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index e09e1b544..8015432df 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -6830,6 +6830,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c6a4fda73..e0b39a57b 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -6529,6 +6529,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 8b30566cd..b260b4039 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -6503,6 +6503,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 79637d35f..5a1aae14c 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6477,6 +6477,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 16ce39e9a..bf6a9d755 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6451,6 +6451,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 90934340c..f1bdac89f 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6905,6 +6905,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 5dba26426..c147d3c80 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6880,6 +6880,7 @@ CONFIG_TRUSTED_KEYS=y
# CONFIG_TSL2591 is not set
CONFIG_TSL2772=m
# CONFIG_TSL4531 is not set
+# CONFIG_TSNEP_SELFTESTS is not set
# CONFIG_TSYS01 is not set
# CONFIG_TSYS02D is not set
CONFIG_TULIP=m
diff --git a/kernel.spec b/kernel.spec
index 5b7daceab..921ebce8d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.10
+%define rpmversion 5.16.11
%define patchversion 5.16
%define pkgrelease 100
@@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.10.tar.xz
+Source0: linux-5.16.11.tar.xz
Source1: Makefile.rhelver
@@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.10 -c
-mv linux-5.16.10 linux-%{KVERREL}
+%setup -q -n kernel-5.16.11 -c
+mv linux-5.16.11 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1946,12 +1946,11 @@ BuildKernel() {
# Clean up intermediate tools files
find $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools \( -iname "*.o" -o -iname "*.cmd" \) -exec rm -f {} +
- # Make sure the Makefile and version.h have a matching timestamp so that
- # external modules can be built
- touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h
-
- # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
- cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
+ # Make sure the Makefile, version.h, and auto.conf have a matching
+ # timestamp so that external modules can be built
+ touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile \
+ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h \
+ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
%if %{with_debuginfo}
eu-readelf -n vmlinux | grep "Build ID" | awk '{print $NF}' > vmlinux.id
@@ -2986,7 +2985,8 @@ fi
#
#
%changelog
-* Wed Feb 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.10-100]
+* Wed Feb 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.11-0]
+- spec: don't overwrite auto.conf with .config (Ondrej Mosnacek)
- New configs for 5.16.10 (Justin M. Forbes)
* Wed Feb 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.10-0]
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 944b3a022..1ec61ee0e 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -50,7 +50,7 @@
49 files changed, 805 insertions(+), 198 deletions(-)
diff --git a/Makefile b/Makefile
-index 36bbff16530b..e17c7fd5312f 100644
+index 00ba75768af7..f95367fb3134 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -465,7 +465,7 @@ index c59265146e9c..caa8458edde2 100644
rv = ipmi_register_driver();
mutex_unlock(&ipmi_interfaces_mutex);
diff --git a/drivers/char/random.c b/drivers/char/random.c
-index a27ae3999ff3..dc4e136adb08 100644
+index ebe86de9d0ac..cf0062d903a1 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -335,6 +335,7 @@
@@ -512,7 +512,7 @@ index a27ae3999ff3..dc4e136adb08 100644
static int
write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
{
-@@ -1983,7 +1999,58 @@ static int random_fasync(int fd, struct file *filp, int on)
+@@ -1986,7 +2002,58 @@ static int random_fasync(int fd, struct file *filp, int on)
return fasync_helper(fd, filp, on, &fasync);
}
@@ -571,7 +571,7 @@ index a27ae3999ff3..dc4e136adb08 100644
.read = random_read,
.write = random_write,
.poll = random_poll,
-@@ -1994,6 +2061,7 @@ const struct file_operations random_fops = {
+@@ -1997,6 +2064,7 @@ const struct file_operations random_fops = {
};
const struct file_operations urandom_fops = {
@@ -579,7 +579,7 @@ index a27ae3999ff3..dc4e136adb08 100644
.read = urandom_read,
.write = random_write,
.unlocked_ioctl = random_ioctl,
-@@ -2002,9 +2070,31 @@ const struct file_operations urandom_fops = {
+@@ -2005,9 +2073,31 @@ const struct file_operations urandom_fops = {
.llseek = noop_llseek,
};
@@ -611,7 +611,7 @@ index a27ae3999ff3..dc4e136adb08 100644
int ret;
if (flags & ~(GRND_NONBLOCK|GRND_RANDOM|GRND_INSECURE))
-@@ -2020,6 +2110,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
+@@ -2023,6 +2113,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
if (count > INT_MAX)
count = INT_MAX;
@@ -630,7 +630,7 @@ index a27ae3999ff3..dc4e136adb08 100644
if (!(flags & GRND_INSECURE) && !crng_ready()) {
if (flags & GRND_NONBLOCK)
return -EAGAIN;
-@@ -2329,3 +2431,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
+@@ -2332,3 +2434,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
add_device_randomness(buf, size);
}
EXPORT_SYMBOL_GPL(add_bootloader_randomness);
@@ -1376,7 +1376,7 @@ index 4c348bacf2cb..9fe496d35b38 100644
soc_hw_version_major, soc_hw_version_minor);
ret = -EOPNOTSUPP;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 1af8a4513708..5a23e077ab86 100644
+index 352766aa3122..16a2c9417536 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1443,7 +1443,7 @@ index 1af8a4513708..5a23e077ab86 100644
}
EXPORT_SYMBOL_GPL(nvme_complete_rq);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 13e5d503ed07..daaeb316f624 100644
+index 99c2307b04e2..654c033bbbb2 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
diff --git a/sources b/sources
index 7e1d1f57e..085557e70 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16.10.tar.xz) = 8b5111d116acc4fb79d5b8320718fd566cbe71719fbf5863973ae8b6fbb6dcac4a30b5f095ffc4fd2721e4c1aa179155892b2bbd73e87eeb3d3e918ff561fc33
-SHA512 (kernel-abi-stablelists-5.16.10-100.tar.bz2) = 40ff62e63013699165a47b12de771d446fada43af6993943a9ed816bb26020cdacad394ad3cd600bc7a2321b6dddb109228c562dd8491827637ea766c52f0303
-SHA512 (kernel-kabi-dw-5.16.10-100.tar.bz2) = a32eb6ac3e67aea26eb344c610c7a93c3e9a36816db288f8810c2788c6677308a7658c02b4d6251dd0fb3a98dbff6ca8770d227b6b8874173d4d7333c630ccd7
+SHA512 (linux-5.16.11.tar.xz) = f04dfec50e8c081139d22dd7ccff927bd01eb0e7f63923c1d939fa3dcf5114408fd58859bfa42abfc812656d60f5303e18657123083bd859021bbeff3c1d025d
+SHA512 (kernel-abi-stablelists-5.16.11-100.tar.bz2) = 1d61a478e8100511923bd73417449e33aad076d362a95469d0603cef94bb65001bbcb46d534957a46e76167940324fb0a2e8f306d4d65aee66623599fff5cb8a
+SHA512 (kernel-kabi-dw-5.16.11-100.tar.bz2) = 6e73d02de9003973757dc047ef83c6b204fd4669335c5ee9a2ed5d64dfd790d5f135669c6e21f5b432a75d9592f7f2f4b58eb0dc7e032d81382ecce6486aedfe
generated by cgit (git 2.34.1) at 2024-04-18 07:00:33 +0000