From 069e5e264cf985c31ef3a44b46035d22d6414ae0 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Jan 14 2022 01:02:14 +0000 Subject: kernel-plus for c7: update to 3.10.0-1160.53.1.el7 Signed-off-by: Akemi Yagi --- diff --git a/.kernel.metadata b/.kernel.metadata index 6cac278..113c596 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,3 +1,3 @@ ba5599148e52ecd126ebcf873672e26d3288323e SOURCES/kernel-abi-whitelists-1160.tar.bz2 5000b85c42ef87b6835dd8eef063e4623c2e0fa9 SOURCES/kernel-kabi-dw-1160.tar.bz2 -ed1bd28b2810b65432006616d756ab4d4cc0c111 SOURCES/linux-3.10.0-1160.49.1.el7.tar.xz +db5aa728019ce4f37e2fb20218b880a1cdaf3745 SOURCES/linux-3.10.0-1160.53.1.el7.tar.xz diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 2ed6fc6..ee70fc1 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/Makefile.common @@ -9,7 +9,7 @@ RPMVERSION:=3.10.0 # marker is git tag which we base off of for exporting patches MARKER:=v3.10 PREBUILD:= -BUILD:=1160.49.1 +BUILD:=1160.53.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SOURCES/patch-i686-amd_c.patch b/SOURCES/patch-i686-amd_c.patch new file mode 100644 index 0000000..14c2696 --- /dev/null +++ b/SOURCES/patch-i686-amd_c.patch @@ -0,0 +1,26 @@ +patch-i686-amd_c.patch + +Fix the build error that started with kernel-3.10.0-1160.53.1.el7: + +arch/x86/kernel/cpu/amd.c:644:13: error: 'init_amd_zn' defined but not used [-Werror=unused-function] + static void init_amd_zn(struct cpuinfo_x86 *c) + ^ + +--- a/arch/x86/kernel/cpu/amd.c 2021-12-16 00:34:31.000000000 -0800 ++++ b/arch/x86/kernel/cpu/amd.c 2022-01-11 15:11:46.300919942 -0800 +@@ -641,6 +641,7 @@ static const int amd_erratum_383[]; + static const int amd_erratum_400[]; + static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum); + ++#ifdef CONFIG_X86_64 + static void init_amd_zn(struct cpuinfo_x86 *c) + { + set_cpu_cap(c, X86_FEATURE_ZEN); +@@ -656,6 +657,7 @@ static void init_amd_zn(struct cpuinfo_x + if (c->x86_model <= 1 && c->x86_mask <= 1) + set_cpu_cap(c, X86_FEATURE_CPB); + } ++#endif + + static void init_amd(struct cpuinfo_x86 *c) + { diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 8f33cda..e4a593b 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -20,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.49.1.el7 +%define pkgrelease 1160.53.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.49.1%{?dist} +%define specrelease 1160.53.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -544,6 +544,7 @@ Patch1311: patch-i686-mce-7_8.patch Patch1312: patch-i686-taintflags-7_9.patch Patch1313: centos-3.10-i686-fix-pcid-bug17925.patch Patch1314: centos-i386-hv_utils.patch +Patch1315: patch-i686-amd_c.patch # end of i686 mods @@ -593,7 +594,7 @@ Patch20236: centos-linux-3.10-cifs-fix-bug16824.patch #Patch20237: centos-linux-3.10-r8169-fix-network-stalls.patch #Patch20238: centos-linux-3.10-acpi-lock-acquisition-bug17118.patch ### wireguard -Patch20239: centos-linux-3.10-wireguard-1.0.20210606.patch +Patch20239: centos-linux-3.10-wireguard-1.0.20211208.patch ### #Patch20250: centos-linux-3.10-hyperv_fb-67e7cdb4829d-bug18117.patch @@ -1029,6 +1030,7 @@ ApplyOptionalPatch patch-i686-mce-7_8.patch ApplyOptionalPatch patch-i686-taintflags-7_9.patch ApplyOptionalPatch centos-3.10-i686-fix-pcid-bug17925.patch ApplyOptionalPatch centos-i386-hv_utils.patch +ApplyOptionalPatch patch-i686-amd_c.patch %endif ### plus mod @@ -1078,7 +1080,7 @@ ApplyOptionalPatch centos-linux-3.10-cifs-fix-bug16824.patch #ApplyOptionalPatch centos-linux-3.10-r8169-fix-network-stalls.patch #ApplyOptionalPatch centos-linux-3.10-acpi-lock-acquisition-bug17118.patch # wireguard -ApplyOptionalPatch centos-linux-3.10-wireguard-1.0.20210606.patch +ApplyOptionalPatch centos-linux-3.10-wireguard-1.0.20211208.patch ### #ApplyOptionalPatch centos-linux-3.10-hyperv_fb-67e7cdb4829d-bug18117.patch ### end of plus mod @@ -2115,7 +2117,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Tue Nov 23 2021 Akemi Yagi [3.10.0-1160.49.1.el7.centos.plus] +* Tue Jan 11 2022 Akemi Yagi [3.10.0-1160.53.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2176,6 +2178,76 @@ fi - wireguard added - UEFI disabled in 32-bit kernel +* Thu Dec 16 2021 Rado Vrbovsky [3.10.0-1160.53.1.el7] +- fuse: fix live lock in fuse_iget() (Miklos Szeredi) [1952046] +- fuse: fix bad inode (Miklos Szeredi) [1952046] +- GFS2: Truncate address space mapping when deleting an inode (Bob Peterson) [1364234] +- gfs2: Fix gfs2_testbit to use clone bitmaps (Bob Peterson) [1364234] +- gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps (Bob Peterson) [1364234] +- gfs2: Fix oversight in gfs2_ail1_flush (Bob Peterson) [1364234] +- gfs2: Additional information when gfs2_ail1_flush withdraws (Bob Peterson) [1364234] +- gfs2: leaf_dealloc needs to allocate one more revoke (Bob Peterson) [1364234] +- gfs2: allow journal replay to hold sd_log_flush_lock (Bob Peterson) [1364234] +- gfs2: don't allow releasepage to free bd still used for revokes (Bob Peterson) [1364234] +- gfs2: flesh out delayed withdraw for gfs2_log_flush (Bob Peterson) [1364234] +- gfs2: Do proper error checking for go_sync family of glops functions (Bob Peterson) [1364234] +- gfs2: drain the ail2 list after io errors (Bob Peterson) [1364234] +- gfs2: Withdraw in gfs2_ail1_flush if write_cache_pages fails (Bob Peterson) [1364234] +- gfs2: Do log_flush in gfs2_ail_empty_gl even if ail list is empty (Bob Peterson) [1364234] +- gfs2: Check for log write errors before telling dlm to unlock (Bob Peterson) [1364234] +- gfs2: Prepare to withdraw as soon as an IO error occurs in log write (Bob Peterson) [1364234] +- gfs2: Issue revokes more intelligently (Bob Peterson) [1364234] +- gfs2: Add verbose option to check_journal_clean (Bob Peterson) [1364234] +- gfs2: fix infinite loop when checking ail item count before go_inval (Bob Peterson) [1364234] +- gfs2: Force withdraw to replay journals and wait for it to finish (Bob Peterson) [1364234] +- gfs2: Allow some glocks to be used during withdraw (Bob Peterson) [1364234] +- gfs2: move check_journal_clean to util.c for future use (Bob Peterson) [1364234] +- gfs2: Ignore dlm recovery requests if gfs2 is withdrawn (Bob Peterson) [1364234] +- gfs2: Only complain the first time an io error occurs in quota or log (Bob Peterson) [1364234] +- gfs2: log error reform (Bob Peterson) [1364234] +- gfs2: Rework how rgrp buffer_heads are managed (Bob Peterson) [1364234] +- gfs2: clear ail1 list when gfs2 withdraws (Bob Peterson) [1364234] +- gfs2: Introduce concept of a pending withdraw (Bob Peterson) [1364234] +- gfs2: Return bool from gfs2_assert functions (Bob Peterson) [1364234] +- gfs2: Turn gfs2_consist into void functions (Bob Peterson) [1364234] +- gfs2: Remove usused cluster_wide arguments of gfs2_consist functions (Bob Peterson) [1364234] +- gfs2: Report errors before withdraw (Bob Peterson) [1364234] +- gfs2: Split gfs2_lm_withdraw into two functions (Bob Peterson) [1364234] +- gfs2: Fix incorrect variable name (Bob Peterson) [1364234] +- gfs2: Don't write log headers after file system withdraw (Bob Peterson) [1364234] +- gfs2: clean up iopen glock mess in gfs2_create_inode (Bob Peterson) [1364234] +- gfs2: Close timing window with GLF_INVALIDATE_IN_PROGRESS (Bob Peterson) [1364234] +- gfs2: fix infinite loop in gfs2_ail1_flush on io error (Bob Peterson) [1364234] +- gfs2: Introduce function gfs2_withdrawn (Bob Peterson) [1364234] +- gfs2: replace more printk with calls to fs_info and friends (Bob Peterson) [1364234] +- gfs2: dump fsid when dumping glock problems (Bob Peterson) [1364234] +- gfs2: simplify gfs2_freeze by removing case (Bob Peterson) [1364234] +- gfs2: Rename SDF_SHUTDOWN to SDF_WITHDRAWN (Bob Peterson) [1364234] +- gfs2: Warn when a journal replay overwrites a rgrp with buffers (Bob Peterson) [1364234] +- gfs2: log which portion of the journal is replayed (Bob Peterson) [1364234] +- gfs2: slow the deluge of io error messages (Bob Peterson) [1364234] +- gfs2: Don't withdraw under a spin lock (Bob Peterson) [1364234] +- GFS2: Clear gl_object when deleting an inode in gfs2_delete_inode (Bob Peterson) [1364234] +- gfs2: Use fs_* functions instead of pr_* function where we can (Bob Peterson) [1364234] +- GFS2: Use pr_ more consistently (Bob Peterson) [1364234] + +* Wed Dec 08 2021 Rado Vrbovsky [3.10.0-1160.52.1.el7] +- acpi-cpufreq: Honor _PSD table setting on new AMD CPUs (David Arcari) [2019588] +- x86/cpu/amd: Call init_amd_zn() om Family 19h processors too (David Arcari) [2019218] +- x86/cpu/AMD: Fix erratum 1076 (CPB bit) (David Arcari) [2019218] +- i40e: Fix the conditional for i40e_vc_validate_vqs_bitmaps (Stefan Assmann) [1977246] +- i40e: Fix virtchnl_queue_select bitmap validation (Stefan Assmann) [1977246] + +* Wed Nov 24 2021 Rado Vrbovsky [3.10.0-1160.51.1.el7] +- mm, fs: Fix do_generic_file_read() error return (Carlos Maiolino) [2020857] +- perf/core: Fix a memory leak in perf_event_parse_addr_filter() (Michael Petlan) [1901932] + +* Thu Nov 18 2021 Rado Vrbovsky [3.10.0-1160.50.1.el7] +- tcp: grow window for OOO packets only for SACK flows (Guillaume Nault) [1990665] +- scsi: mpt3sas: Fix unlock imbalance (Tomas Henzl) [2006536] +- pci-hyperv: Fix setting CPU affinity on Azure (Vitaly Kuznetsov) [2019272] +- media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt() (Lucas Zampieri) [1956471] {CVE-2021-42739} + * Tue Nov 09 2021 Rado Vrbovsky [3.10.0-1160.49.1.el7] - NFS: Fix interrupted slots by sending a solo SEQUENCE operation (Scott Mayhew) [2007465]