diff --git a/Makefile.rhelver b/Makefile.rhelver index 157f65f..29d1a77 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 154 +RHEL_RELEASE = 155 # # ZSTREAM @@ -66,4 +66,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.154 +RTBUILD:=.155 diff --git a/check-kabi b/check-kabi index f9d4dcb..3809209 100755 --- a/check-kabi +++ b/check-kabi @@ -41,7 +41,8 @@ def load_symvers(symvers, filename): break if in_line == "\n": continue - checksum, symbol, directory, type = in_line.split() + checksum, symbol, directory, type, *ns = in_line.split() + ns = ns[0] if ns else None symvers[symbol] = in_line[0:-1] @@ -57,7 +58,8 @@ def load_kabi(kabi, filename): break if in_line == "\n": continue - checksum, symbol, directory, type = in_line.split() + checksum, symbol, directory, type, *ns = in_line.split() + ns = ns[0] if ns else None kabi[symbol] = in_line[0:-1] @@ -69,11 +71,14 @@ def check_kabi(symvers, kabi): warn = 0 changed_symbols = [] moved_symbols = [] + ns_symbols = [] for symbol in kabi: - abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split() + abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split() + abi_ns = abi_ns[0] if abi_ns else None if symbol in symvers: - sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split() + sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split() + sym_ns = sym_ns[0] if sym_ns else None if abi_hash != sym_hash: fail = 1 changed_symbols.append(symbol) @@ -81,6 +86,10 @@ def check_kabi(symvers, kabi): if abi_dir != sym_dir: warn = 1 moved_symbols.append(symbol) + + if abi_ns != sym_ns: + warn = 1 + ns_symbols.append(symbol) else: fail = 1 changed_symbols.append(symbol) @@ -96,13 +105,21 @@ def check_kabi(symvers, kabi): if warn: print("*** WARNING - ABI SYMBOLS MOVED ***") - print("") - print("The following symbols moved (typically caused by moving a symbol from being") - print("provided by the kernel vmlinux out to a loadable module):") - print("") - for symbol in moved_symbols: - print(symbol) - print("") + if moved_symbols: + print("") + print("The following symbols moved (typically caused by moving a symbol from being") + print("provided by the kernel vmlinux out to a loadable module):") + print("") + for symbol in moved_symbols: + print(symbol) + print("") + if ns_symbols: + print("") + print("The following symbols changed symbol namespaces:") + print("") + for symbol in ns_symbols: + print(symbol) + print("") """Halt the build, if we got errors and/or warnings. In either case, double-checkig is required to avoid introducing / concealing diff --git a/kernel.spec b/kernel.spec index 7488137..19b8380 100755 --- a/kernel.spec +++ b/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 154.rt21.154.el9 +%define pkgrelease 155.rt21.155.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 154.rt21.154%{?buildid}%{?dist} +%define specrelease 155.rt21.155%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -707,7 +707,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-154.rt21.154.el9.tar.xz +Source0: linux-5.14.0-155.rt21.155.el9.tar.xz Source1: Makefile.rhelver @@ -1422,8 +1422,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-154.rt21.154.el9 -c -mv linux-5.14.0-154.rt21.154.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-155.rt21.155.el9 -c +mv linux-5.14.0-155.rt21.155.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3147,6 +3147,40 @@ fi # # %changelog +* Wed Aug 24 2022 Luis Claudio R. Goncalves [5.14.0-155.rt21.155.el9] +- [rt] build kernel-rt-5.14.0-155.rt21.155.el9 [2061574] +- i40e: Fix tunnel checksum offload with fragmented traffic (Ivan Vecera) [2104734] +- wait: Fix __wait_event_hrtimeout for RT/DL tasks (Prarit Bhargava) [2112265] +- raid1: ensure write behind bio has less than BIO_MAX_VECS sectors (Nigel Croxon) [2117034] +- KVM: nVMX: Inject #UD if VMXON is attempted with incompatible CR0/CR4 (Vitaly Kuznetsov) [2118955] +- iavf: Fix deadlock in initialization (Petr Oros) [2106658] +- netfilter: nf_tables: do not allow RULE_ID to refer to another chain (Florian Westphal) [2116357] {CVE-2022-2586} +- netfilter: nf_tables: do not allow CHAIN_ID to refer to another table (Florian Westphal) [2116357] {CVE-2022-2586} +- netfilter: nf_tables: do not allow SET_ID to refer to another table (Florian Westphal) [2116357] {CVE-2022-2586} +- kbuild: expose explicit .symversions targets (Čestmír Kalina) [2066238] +- selftests: mptcp: make sendfile selftest work (Florian Westphal) [2109043] +- netfilter: nf_queue: do not allow packet truncation below transport header offset (Florian Westphal) [2116161] {CVE-2022-36946} +- ASoC: amd: yc: Update DMI table entries for AMD platforms (Jaroslav Kysela) [2114934] +- ASoC: amd: yc: Update DMI table entries (Jaroslav Kysela) [2114934] +- sfc: fix use after free when disabling sriov (Íñigo Huguet) [2097189] +- mm: Fix PASID use-after-free issue (Jerry Snitselaar) [2113044] +- ice: Fix VF not able to send tagged traffic with no VLAN filters (Petr Oros) [2116964] +- ice: Ignore error message when setting same promiscuous mode (Petr Oros) [2116964] +- ice: Fix clearing of promisc mode with bridge over bond (Petr Oros) [2116964] +- ice: Ignore EEXIST when setting promisc mode (Petr Oros) [2116964] +- ice: Fix double VLAN error when entering promisc mode (Petr Oros) [2116964] +- ice: Fix promiscuous mode not turning off (Petr Oros) [2116964] +- ice: Introduce enabling promiscuous mode on multiple VF's (Petr Oros) [2116964] +- ice: do not setup vlan for loopback VSI (Petr Oros) [2116964] +- ice: check (DD | EOF) bits on Rx descriptor rather than (EOP | RS) (Petr Oros) [2116964] +- ice: Fix VSIs unable to share unicast MAC (Petr Oros) [2116964] +- ice: Fix max VLANs available for VF (Petr Oros) [2116964] +- ice: change devlink code to read NVM in blocks (Petr Oros) [2116964] +- be2net: Remove useless DMA-32 fallback configuration (Petr Oros) [2051280] +- ethernet: constify references to netdev->dev_addr in drivers (Petr Oros) [2051280] +- ethernet: Remove redundant 'flush_workqueue()' calls (Petr Oros) [2051280] +- be2net: Use irq_update_affinity_hint() (Petr Oros) [2051280] + * Wed Aug 24 2022 Luis Claudio R. Goncalves [5.14.0-154.rt21.154.el9] - [rt] build kernel-rt-5.14.0-154.rt21.154.el9 [2061574] - Revert "x86/sev: Expose sev_es_ghcb_hv_call() for use by HyperV" (John Allen) [2081424] diff --git a/sources b/sources index dff8b2e..40d1ec8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c -SHA512 (linux-5.14.0-154.rt21.154.el9.tar.xz) = 1a606f334c0f51dbddcfc6deac03d7fc399e6e820b7d50a743ab43a80ea164acdc245b83eb2cd800c92878af6b23d39f8851bb048591607d4c3f6f25fccc6346 -SHA512 (kernel-abi-stablelists-5.14.0-154.rt21.154.el9.tar.bz2) = de8e4d4a6e611115195f758078c087dfa8b06dbc5ed1fd5ad2a427534d9a0542d2600d220942caf4c97638cb50076262bbb5be34cab03919273f98cc35a3ae47 -SHA512 (kernel-kabi-dw-5.14.0-154.rt21.154.el9.tar.bz2) = 565f812fa83a756ef7b91219031cfe80b1e853f22b4ed38ada76aed482caaf89df35e4d220f45728392765a757f8b0798e3b5a57fee0114e1d0379e887772578 +SHA512 (linux-5.14.0-155.rt21.155.el9.tar.xz) = b82c93a8200c3abda507fdbab13ad2156ae347c09f7433faeb5a3c2bd4f1401788afa97706928630484f74bc8bbc366e1d0fb7988996d63510384bb5d17d7cda +SHA512 (kernel-abi-stablelists-5.14.0-155.rt21.155.el9.tar.bz2) = bde587ee6356f6da5cdac1fe6aa9949f6b098239fa3212fbc2c5802e5ef2563a97d623bb37ff9b5fc3612ffd6633a07563b2ba8e401be0ca62fd4a31eca167cd +SHA512 (kernel-kabi-dw-5.14.0-155.rt21.155.el9.tar.bz2) = 565f812fa83a756ef7b91219031cfe80b1e853f22b4ed38ada76aed482caaf89df35e4d220f45728392765a757f8b0798e3b5a57fee0114e1d0379e887772578