diff --git a/.kernel-automotive.metadata b/.kernel-automotive.metadata index e13c615..99985e9 100644 --- a/.kernel-automotive.metadata +++ b/.kernel-automotive.metadata @@ -1 +1 @@ -c64d39d20903458614a72333bcfa736409e52109 SOURCES/linux-5.14.0-46.11.el9.tar.xz +24c9f15cd94fdc96ea631d7db0b65859c470c118 SOURCES/linux-5.14.0-47.12.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 73c9897..de046ab 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 = 46 +RHEL_RELEASE = 47 # # Automotive Release # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.11 +AUTOMOTIVEBUILD:=.12 # # Early y+1 numbering @@ -51,4 +51,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.46 +RTBUILD:=.47 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 1ac8255..7af9495 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 46 +%global distro_build 47 %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 46.11.el9 +%define pkgrelease 47.12.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 46.11%{?buildid}%{?dist} +%define specrelease 47.12%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -283,7 +283,7 @@ Summary: The Linux kernel %endif %if %{with_automotive} -%global automotivebuild .11 +%global automotivebuild .12 %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-46.11.el9.tar.xz +Source0: linux-5.14.0-47.12.el9.tar.xz Source1: Makefile.rhelver @@ -1432,8 +1432,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-46.11.el9 -c -mv linux-5.14.0-46.11.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-47.12.el9 -c +mv linux-5.14.0-47.12.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3083,6 +3083,53 @@ fi # # %changelog +* Fri Jan 28 2022 Scott Weaver [5.14.0-47.12.el9] +- Revert "Merge: virtio: support virtio-mem on x86-64 as tech-preview" (Juri Lelli) +- nvmet: register discovery subsystem as 'current' (John Meneghini) [2021672] +- nvme: add new discovery log page entry definitions (John Meneghini) [2021672] +- nvmet: switch check for subsystem type (John Meneghini) [2021672] +- nvme: display correct subsystem NQN (John Meneghini) [2021672] +- nvme: Add connect option 'discovery' (John Meneghini) [2021672] +- nvme: expose subsystem type in sysfs attribute 'subsystype' (John Meneghini) [2021672] +- nvmet: set 'CNTRLTYPE' in the identify controller data (John Meneghini) [2021672] +- nvmet: add nvmet_is_disc_subsys() helper (John Meneghini) [2021672] +- nvme: add CNTRLTYPE definitions for 'identify controller' (John Meneghini) [2021672] +- nvmet: make discovery NQN configurable (John Meneghini) [2021672] +- nitro_enclaves: Use get_user_pages_unlocked() call to handle mmap assert (Vitaly Kuznetsov) [2034619] +- include/linux/pci.h: Exclude struct hotplug_slot from KABI (Prarit Bhargava) [2034338] +- virtio/vsock: fix the transport to work with VMADDR_CID_ANY (Stefano Garzarella) [2026949] +- vhost/vsock: cleanup removing `len` variable (Stefano Garzarella) [2026949] +- vhost/vsock: fix incorrect used length reported to the guest (Stefano Garzarella) [2026949] +- vsock: prevent unnecessary refcnt inc for nonblocking connect (Stefano Garzarella) [2026949] +- vsock_diag_test: remove free_sock_stat() call in test_no_sockets (Stefano Garzarella) [2026949] +- vsock: Enable y2038 safe timeval for timeout (Stefano Garzarella) [2026949] +- vsock: Refactor vsock_*_getsockopt to resemble sock_getsockopt (Stefano Garzarella) [2026949] +- vsock_test: update message bounds test for MSG_EOR (Stefano Garzarella) [2026949] +- af_vsock: rename variables in receive loop (Stefano Garzarella) [2026949] +- virtio/vsock: support MSG_EOR bit processing (Stefano Garzarella) [2026949] +- vhost/vsock: support MSG_EOR bit processing (Stefano Garzarella) [2026949] +- virtio/vsock: add 'VIRTIO_VSOCK_SEQ_EOR' bit. (Stefano Garzarella) [2026949] +- virtio/vsock: rename 'EOR' to 'EOM' bit. (Stefano Garzarella) [2026949] +- include/linux/irq*.h: Pad irq structs for KABI (Prarit Bhargava) [2034264] +- include/linux/fwnode.h: Exclude fwnode structs from KABI (Prarit Bhargava) [2033388] +- bpf: Fix toctou on read-only map's constant scalar tracking (Jiri Olsa) [2029198] {CVE-2021-4001} +- ACPI: tables: FPDT: Do not print FW_BUG message if record types are reserved (Mark Langsdorf) [2000202] +- redhat: support virtio-mem on x86-64 as tech-preview (David Hildenbrand) [2014492] +- proc/vmcore: fix clearing user buffer by properly using clear_user() (David Hildenbrand) [2014492] +- virtio-mem: support VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE (David Hildenbrand) [2014492] +- virtio-mem: disallow mapping virtio-mem memory via /dev/mem (David Hildenbrand) [2014492] +- kernel/resource: disallow access to exclusive system RAM regions (David Hildenbrand) [2014492] +- kernel/resource: clean up and optimize iomem_is_exclusive() (David Hildenbrand) [2014492] +- virtio-mem: kdump mode to sanitize /proc/vmcore access (David Hildenbrand) [2014492] +- virtio-mem: factor out hotplug specifics from virtio_mem_remove() into virtio_mem_deinit_hotplug() (David Hildenbrand) [2014492] +- virtio-mem: factor out hotplug specifics from virtio_mem_probe() into virtio_mem_init_hotplug() (David Hildenbrand) [2014492] +- virtio-mem: factor out hotplug specifics from virtio_mem_init() into virtio_mem_init_hotplug() (David Hildenbrand) [2014492] +- proc/vmcore: convert oldmem_pfn_is_ram callback to more generic vmcore callbacks (David Hildenbrand) [2014492] +- proc/vmcore: let pfn_is_ram() return a bool (David Hildenbrand) [2014492] +- x86/xen: print a warning when HVMOP_get_mem_type fails (David Hildenbrand) [2014492] +- x86/xen: simplify xen_oldmem_pfn_is_ram() (David Hildenbrand) [2014492] +- x86/xen: update xen_oldmem_pfn_is_ram() documentation (David Hildenbrand) [2014492] + * Fri Jan 28 2022 Scott Weaver [5.14.0-46.11.el9] - crypto: qat - fix definition of ring reset results (Vladis Dronov) [2015145] - crypto: qat - add support for compression for 4xxx (Vladis Dronov) [2015145]