diff --git a/.kernel-automotive.metadata b/.kernel-automotive.metadata index 86538a7..2e197c8 100644 --- a/.kernel-automotive.metadata +++ b/.kernel-automotive.metadata @@ -1 +1 @@ -abd047668859d4bad2cabb5940c93da51be94e50 SOURCES/linux-5.14.0-48.13.el9.tar.xz +1c52d44d4127cd3d036a9bf03586366faf1549aa SOURCES/linux-5.14.0-49.14.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 85b4d4f..26e5f5f 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,14 +12,14 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 48 +RHEL_RELEASE = 49 # # Automotive Release # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.13 +AUTOMOTIVEBUILD:=.14 # # Early y+1 numbering @@ -51,4 +51,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.48 +RTBUILD:=.49 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 45ecf55..06827aa 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 48 +%global distro_build 49 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 48.13.el9 +%define pkgrelease 49.14.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 48.13%{?buildid}%{?dist} +%define specrelease 49.14%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -283,7 +283,7 @@ Summary: The Linux kernel %endif %if %{with_automotive} -%global automotivebuild .13 +%global automotivebuild .14 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -705,7 +705,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-48.13.el9.tar.xz +Source0: linux-5.14.0-49.14.el9.tar.xz Source1: Makefile.rhelver @@ -1432,8 +1432,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-48.13.el9 -c -mv linux-5.14.0-48.13.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-49.14.el9 -c +mv linux-5.14.0-49.14.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3083,6 +3083,45 @@ fi # # %changelog +* Sun Jan 30 2022 Scott Weaver [5.14.0-49.14.el9] +- net: skb: use kfree_skb_reason() in __udp4_lib_rcv() (Antoine Tenart) [2041931] +- net: skb: use kfree_skb_reason() in tcp_v4_rcv() (Antoine Tenart) [2041931] +- net: skb: introduce kfree_skb_reason() (Antoine Tenart) [2041931] +- net: add kerneldoc comment for sk_peer_lock (Guillaume Nault) [2037783] +- af_unix: fix races in sk_peer_pid and sk_peer_cred accesses (Guillaume Nault) [2037783] {CVE-2021-4203} +- netfilter: nat: force port remap to prevent shadowing well-known ports (Florian Westphal) [2006169] {CVE-2021-3773} +- netfilter: conntrack: tag conntracks picked up in local out hook (Florian Westphal) [2006169] +- selftests: nft_nat: switch port shadow test cases to socat (Florian Westphal) [2006169] +- selftests: nft_nat: Simplify port shadow notrack test (Florian Westphal) [2006169] +- selftests: nft_nat: Improve port shadow test stability (Florian Westphal) [2006169] +- selftests: nft_nat: add udp hole punch test case (Florian Westphal) [2006169] +- net: Remove redundant if statements (Petr Oros) [2037315] +- netdevice: add the case if dev is NULL (Petr Oros) [2037315] +- redhat: fix the exclusion of rhdocs changes entries in the changelog (Herton R. Krzesinski) +- get_maintainer.conf: Update with new location of RHMAINTAINERS (Prarit Bhargava) +- redhat: make pathspec exclusion compatible with old git versions (Herton R. Krzesinski) +- redhat/scripts: Update merge-subtrees.sh with new subtree location (Prarit Bhargava) +- tree: remove existing redhat/rhdocs subtree in 9.0 (Prarit Bhargava) +- CI: Use realtime_check_baseline template (Veronika Kabatova) +- powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic (Gustavo Walbon) [2025518] +- powerpc: handle kdump appropriately with crash_kexec_post_notifiers option (Gustavo Walbon) [2025518] +- powerpc/pseries: use slab context cpumask allocation in CPU hotplug init (Waiman Long) [2019671] +- powerpc/pseries: Fix build error when NUMA=n (Waiman Long) [2019671] +- powerpc/smp: Use existing L2 cache_map cpumask to find L3 cache siblings (Diego Domingos) [2039639] +- powerpc/cacheinfo: Remove the redundant get_shared_cpu_map() (Diego Domingos) [2039639] +- powerpc/cacheinfo: Lookup cache by dt node and thread-group id (Diego Domingos) [2039639] +- powerpc: select CPUMASK_OFFSTACK if NR_CPUS >= 8192 (Diego Domingos) [2039163] +- powerpc: remove cpu_online_cores_map function (Diego Domingos) [2039163] +- adding support for c9s automotive coverage build (bgrech) +- CI: Use tagged containers (Veronika Kabatova) +- xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate (Carlos Maiolino) [2034871] {CVE-2021-4155} +- selftests/powerpc: skip tests for unavailable mitigations. (Diego Domingos) [2021389] +- selftests/powerpc: Use date instead of EPOCHSECONDS in mitigation-patching.sh (Diego Domingos) [2021389] +- ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate (William Zhao) [2037810] +- KVM: x86: Wait for IPIs to be delivered when handling Hyper-V TLB flush hypercall (Vitaly Kuznetsov) [2036570] +- net: vlan: fix underflow for the real_dev refcnt (Balazs Nemeth) [2030036] +- net: vlan: fix a UAF in vlan_dev_real_dev() (Balazs Nemeth) [2030036] + * Sat Jan 29 2022 Scott Weaver [5.14.0-48.13.el9] - net: mana: Add RX fencing (Mohammed Gamal) [2030357] - net: mana: Add XDP support (Mohammed Gamal) [2030357]