From: Rupinderjit Singh <rusi...@redhat.com> Merge branch kernel-ark:os-build into rusingh/rb3gen2Rhel diff --git a/.gitignore b/.gitignore index blahblah..blahblah 100644 --- a/.gitignore +++ b/.gitignore @@ -182,6 +182,9 @@ redhat/rhdocs/* redhat/rhdocs localversion .get_maintainer.conf +kernel-automotive* +kernel-redhat.spec.template +filtermods.log # GitLab CI configuration !.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -289,11 +289,16 @@ workflow: rpmbuild_with: automotive base package_name: kernel-automotive architectures: x86_64 aarch64 + srpm_make_target: AUTOMOTIVE_BUILD=1 dist-srpm .eln_automotive_debug: variables: rpmbuild_with: automotive debug package_name: kernel-automotive architectures: x86_64 aarch64 + srpm_make_target: AUTOMOTIVE_BUILD=1 dist-srpm +.c10s_automotive_disttag: + variables: + disttag_override: '.el10iv' # Rawhide CI rawhide_merge_request: @@ -568,11 +573,11 @@ c10s_realtime_64k_debug_merge_request: c10s_automotive_merge_request: extends: [.merge_request, .trigger_c10s, .no_tests, .merge_ark_latest, .manual_for_bot, - .eln_automotive] + .eln_automotive, .c10s_automotive_disttag] c10s_automotive_debug_merge_request: extends: [.merge_request, .trigger_c10s, .no_tests, .merge_ark_latest, .manual_for_bot, - .eln_automotive_debug] + .eln_automotive_debug, .c10s_automotive_disttag] # c10s baselines c10s_baseline: @@ -617,11 +622,11 @@ c10s_realtime_64k_debug_baseline: c10s_automotive_baseline: extends: [.baseline, .trigger_c10s, .no_tests, .ark_latest_head, - .eln_automotive] + .eln_automotive, .c10s_automotive_disttag] c10s_automotive_debug_baseline: extends: [.baseline, .trigger_c10s, .no_tests, .ark_latest_head, - .eln_automotive_debug] + .eln_automotive_debug, .c10s_automotive_disttag] # c10s CKI container image gating c10s_cki_gating: diff --git a/.mailmap b/.mailmap index blahblah..blahblah 100644 --- a/.mailmap +++ b/.mailmap @@ -197,6 +197,7 @@ Daniel Borkmann <dan...@iogearbox.net> <daniel.borkm...@tik.ee.ethz.ch> Daniel Borkmann <dan...@iogearbox.net> <dborkm...@redhat.com> Daniel Borkmann <dan...@iogearbox.net> <dbork...@redhat.com> Daniel Borkmann <dan...@iogearbox.net> <dxc...@gmail.com> +Danilo Krummrich <d...@kernel.org> <d...@redhat.com> David Brownell <davi...@pacbell.net> David Collins <quic_colli...@quicinc.com> <colli...@codeaurora.org> David Heidelberg <da...@ixit.cz> <d.ok...@gmail.com> @@ -282,6 +283,7 @@ Gustavo Padovan <gust...@las.ic.unicamp.br> Gustavo Padovan <pado...@profusion.mobi> Hamza Mahfooz <hamzamahf...@linux.microsoft.com> <hamza.mahf...@amd.com> Hanjun Guo <guohan...@huawei.com> <hanjun....@linaro.org> +Hans de Goede <ha...@kernel.org> <hdego...@redhat.com> Hans Verkuil <hverk...@xs4all.nl> <hansv...@cisco.com> Hans Verkuil <hverk...@xs4all.nl> <hverkuil-ci...@xs4all.nl> Harry Yoo <harry....@oracle.com> <42.hye...@gmail.com> @@ -426,6 +428,9 @@ Krzysztof Wilczyński <kwilczyn...@kernel.org> <krzysztof.wilczyn...@linux.com> Krzysztof Wilczyński <kwilczyn...@kernel.org> <k...@linux.com> Kshitiz Godara <quic_kgod...@quicinc.com> <kgod...@codeaurora.org> Kuninori Morimoto <kuninori.morimoto...@renesas.com> +Kuniyuki Iwashima <kun...@google.com> <kun...@amazon.com> +Kuniyuki Iwashima <kun...@google.com> <kun...@amazon.co.jp> +Kuniyuki Iwashima <kun...@google.com> <kuni1...@gmail.com> Kuogee Hsieh <quic_khs...@quicinc.com> <khs...@codeaurora.org> Lee Jones <l...@kernel.org> <jones...@google.com> Lee Jones <l...@kernel.org> <lee.jo...@canonical.com> @@ -688,9 +693,10 @@ Serge Hallyn <ser...@kernel.org> <serge.hal...@canonical.com> Serge Hallyn <ser...@kernel.org> <se...@us.ibm.com> Seth Forshee <sfors...@kernel.org> <seth.fors...@canonical.com> Shakeel Butt <shakeel.b...@linux.dev> <shake...@google.com> -Shannon Nelson <shannon.nel...@amd.com> <snel...@pensando.io> -Shannon Nelson <shannon.nel...@amd.com> <shannon.nel...@intel.com> -Shannon Nelson <shannon.nel...@amd.com> <shannon.nel...@oracle.com> +Shannon Nelson <s...@onemain.com> <shannon.nel...@amd.com> +Shannon Nelson <s...@onemain.com> <snel...@pensando.io> +Shannon Nelson <s...@onemain.com> <shannon.nel...@intel.com> +Shannon Nelson <s...@onemain.com> <shannon.nel...@oracle.com> Sharath Chandra Vurukala <quic_shara...@quicinc.com> <shara...@codeaurora.org> Shiraz Hashim <shiraz.linux.ker...@gmail.com> <shiraz.has...@st.com> Shuah Khan <sh...@kernel.org> <shuahk...@gmail.com> @@ -719,6 +725,7 @@ Srinivas Ramana <quic_sram...@quicinc.com> <sram...@codeaurora.org> Sriram R <quic_srirr...@quicinc.com> <srirr...@codeaurora.org> Sriram Yagnaraman <sriram.yagnara...@ericsson.com> <sriram.yagnara...@est.tech> Stanislav Fomichev <s...@fomichev.me> <s...@google.com> +Stanislav Fomichev <s...@fomichev.me> <stfomic...@gmail.com> Stefan Wahren <wahre...@gmx.net> <stefan.wah...@i2se.com> Stéphane Witzmann <stephane.witzm...@ubpmes.univ-bpclermont.fr> Stephen Hemminger <step...@networkplumber.org> <shemmin...@linux-foundation.org> diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst index blahblah..blahblah 100644 --- a/Documentation/admin-guide/cifs/usage.rst +++ b/Documentation/admin-guide/cifs/usage.rst @@ -270,6 +270,8 @@ configured for Unix Extensions (and the client has not disabled illegal Windows/NTFS/SMB characters to a remap range (this mount parameter is the default for SMB3). This remap (``mapposix``) range is also compatible with Mac (and "Services for Mac" on some older Windows). +When POSIX Extensions for SMB 3.1.1 are negotiated, remapping is automatically +disabled. CIFS VFS Mount Options ====================== diff --git a/Documentation/arch/arm64/booting.rst b/Documentation/arch/arm64/booting.rst index blahblah..blahblah 100644 --- a/Documentation/arch/arm64/booting.rst +++ b/Documentation/arch/arm64/booting.rst @@ -234,7 +234,7 @@ Before jumping into the kernel, the following conditions must be met: - If the kernel is entered at EL1: - - ICC.SRE_EL2.Enable (bit 3) must be initialised to 0b1 + - ICC_SRE_EL2.Enable (bit 3) must be initialised to 0b1 - ICC_SRE_EL2.SRE (bit 0) must be initialised to 0b1. - The DT or ACPI tables must describe a GICv3 interrupt controller. diff --git a/Documentation/block/ublk.rst b/Documentation/block/ublk.rst index blahblah..blahblah 100644 --- a/Documentation/block/ublk.rst +++ b/Documentation/block/ublk.rst @@ -352,6 +352,83 @@ For reaching best IO performance, ublk server should align its segment parameter of `struct ublk_param_segment` with backend for avoiding unnecessary IO split, which usually hurts io_uring performance. +Auto Buffer Registration +------------------------ + +The ``UBLK_F_AUTO_BUF_REG`` feature automatically handles buffer registration +and unregistration for I/O requests, which simplifies the buffer management +process and reduces overhead in the ublk server implementation. + +This is another feature flag for using zero copy, and it is compatible with +``UBLK_F_SUPPORT_ZERO_COPY``. + +Feature Overview +~~~~~~~~~~~~~~~~ + +This feature automatically registers request buffers to the io_uring context +before delivering I/O commands to the ublk server and unregisters them when +completing I/O commands. This eliminates the need for manual buffer +registration/unregistration via ``UBLK_IO_REGISTER_IO_BUF`` and +``UBLK_IO_UNREGISTER_IO_BUF`` commands, then IO handling in ublk server +can avoid dependency on the two uring_cmd operations. + +IOs can't be issued concurrently to io_uring if there is any dependency +among these IOs. So this way not only simplifies ublk server implementation, +but also makes concurrent IO handling becomes possible by removing the +dependency on buffer registration & unregistration commands. + +Usage Requirements +~~~~~~~~~~~~~~~~~~ + +1. The ublk server must create a sparse buffer table on the same ``io_ring_ctx`` + used for ``UBLK_IO_FETCH_REQ`` and ``UBLK_IO_COMMIT_AND_FETCH_REQ``. If + uring_cmd is issued on a different ``io_ring_ctx``, manual buffer + unregistration is required. + +2. Buffer registration data must be passed via uring_cmd's ``sqe->addr`` with the + following structure:: + + struct ublk_auto_buf_reg { + __u16 index; /* Buffer index for registration */ + __u8 flags; /* Registration flags */ + __u8 reserved0; /* Reserved for future use */ + __u32 reserved1; /* Reserved for future use */ + }; + + ublk_auto_buf_reg_to_sqe_addr() is for converting the above structure into + ``sqe->addr``. + +3. All reserved fields in ``ublk_auto_buf_reg`` must be zeroed. + +4. Optional flags can be passed via ``ublk_auto_buf_reg.flags``. + +Fallback Behavior +~~~~~~~~~~~~~~~~~ + +If auto buffer registration fails: + +1. When ``UBLK_AUTO_BUF_REG_FALLBACK`` is enabled: + + - The uring_cmd is completed + - ``UBLK_IO_F_NEED_REG_BUF`` is set in ``ublksrv_io_desc.op_flags`` + - The ublk server must manually deal with the failure, such as, register + the buffer manually, or using user copy feature for retrieving the data + for handling ublk IO + +2. If fallback is not enabled: + + - The ublk I/O request fails silently + - The uring_cmd won't be completed + +Limitations +~~~~~~~~~~~ + +- Requires same ``io_ring_ctx`` for all operations +- May require manual buffer management in fallback cases +- io_ring_ctx buffer table has a max size of 16K, which may not be enough + in case that too many ublk devices are handled by this single io_ring_ctx + and each one has very large queue depth + References ========== diff --git a/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml index blahblah..blahblah 100644 --- a/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml @@ -15,7 +15,7 @@ description: | Some peripherals such as PWM have their I/O go through the 4 "GPIOs". maintainers: - - Jianlong Huang <jianlong.hu...@starfivetech.com> + - Hal Feng <hal.f...@starfivetech.com> properties: compatible: diff --git a/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml index blahblah..blahblah 100644 --- a/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml @@ -18,7 +18,7 @@ description: | any GPIO can be set up to be controlled by any of the peripherals. maintainers: - - Jianlong Huang <jianlong.hu...@starfivetech.com> + - Hal Feng <hal.f...@starfivetech.com> properties: compatible: diff --git a/Documentation/devicetree/bindings/pmem/pmem-region.txt b/Documentation/devicetree/bindings/pmem/pmem-region.txt deleted file mode 100644 index blahblah..blahblah 0 --- a/Documentation/devicetree/bindings/pmem/pmem-region.txt +++ /dev/null @@ -1,65 +0,0 @@ -Device-tree bindings for persistent memory regions ------------------------------------------------------ - -Persistent memory refers to a class of memory devices that are: - - a) Usable as main system memory (i.e. cacheable), and - b) Retain their contents across power failure. - -Given b) it is best to think of persistent memory as a kind of memory mapped -storage device. To ensure data integrity the operating system needs to manage -persistent regions separately to the normal memory pool. To aid with that this -binding provides a standardised interface for discovering where persistent -memory regions exist inside the physical address space. - -Bindings for the region nodes: ------------------------------ - -Required properties: - - compatible = "pmem-region" - - - reg = <base, size>; - The reg property should specify an address range that is - translatable to a system physical address range. This address - range should be mappable as normal system memory would be - (i.e cacheable). - - If the reg property contains multiple address ranges - each address range will be treated as though it was specified - in a separate device node. Having multiple address ranges in a - node implies no special relationship between the two ranges. - -Optional properties: - - Any relevant NUMA associativity properties for the target platform. - - - volatile; This property indicates that this region is actually - backed by non-persistent memory. This lets the OS know that it - may skip the cache flushes required to ensure data is made - persistent after a write. - - If this property is absent then the OS must assume that the region - is backed by non-volatile memory. - -Examples: --------------------- - - /* - * This node specifies one 4KB region spanning from - * 0x5000 to 0x5fff that is backed by non-volatile memory. - */ - pmem@5000 { - compatible = "pmem-region"; - reg = <0x00005000 0x00001000>; - }; - - /* - * This node specifies two 4KB regions that are backed by - * volatile (normal) memory. - */ - pmem@6000 { - compatible = "pmem-region"; - reg = < 0x00006000 0x00001000 - 0x00008000 0x00001000 >; - volatile; - }; - diff --git a/Documentation/devicetree/bindings/pmem/pmem-region.yaml b/Documentation/devicetree/bindings/pmem/pmem-region.yaml new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/Documentation/devicetree/bindings/pmem/pmem-region.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pmem-region.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +maintainers: + - Oliver O'Halloran <ooh...@gmail.com> + +title: Persistent Memory Regions + +description: | + Persistent memory refers to a class of memory devices that are: + + a) Usable as main system memory (i.e. cacheable), and + b) Retain their contents across power failure. + + Given b) it is best to think of persistent memory as a kind of memory mapped + storage device. To ensure data integrity the operating system needs to manage + persistent regions separately to the normal memory pool. To aid with that this + binding provides a standardised interface for discovering where persistent + memory regions exist inside the physical address space. + +properties: + compatible: + const: pmem-region + + reg: + maxItems: 1 + + volatile: + description: + Indicates the region is volatile (non-persistent) and the OS can skip + cache flushes for writes + type: boolean + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + pmem@5000 { + compatible = "pmem-region"; + reg = <0x00005000 0x00001000>; + }; diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index blahblah..blahblah 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -584,7 +584,6 @@ encoded manner. The codes are the following: ms may share gd stack segment growns down pf pure PFN range - dw disabled write to the mapped file lo pages are locked in memory io memory mapped I/O area sr sequential read advise provided @@ -607,8 +606,11 @@ encoded manner. The codes are the following: mt arm64 MTE allocation tags are enabled um userfaultfd missing tracking uw userfaultfd wr-protect tracking + ui userfaultfd minor fault ss shadow/guarded control stack page sl sealed + lf lock on fault pages + dp always lazily freeable mapping == ======================================= Note that there is no guarantee that every flag and associated mnemonic will diff --git a/Documentation/gpu/nouveau.rst b/Documentation/gpu/nouveau.rst index blahblah..blahblah 100644 --- a/Documentation/gpu/nouveau.rst +++ b/Documentation/gpu/nouveau.rst @@ -25,7 +25,7 @@ providing a consistent API to upper layers of the driver stack. GSP Support ------------------------ -.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c :doc: GSP message queue element .. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index blahblah..blahblah 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -7,6 +7,9 @@ protocol: genetlink-legacy doc: Partial family for Ethtool Netlink. uapi-header: linux/ethtool_netlink_generated.h +c-family-name: ethtool-genl-name +c-version-name: ethtool-genl-version + definitions: - name: udp-tunnel-type diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst index blahblah..blahblah 100644 --- a/Documentation/process/embargoed-hardware-issues.rst +++ b/Documentation/process/embargoed-hardware-issues.rst @@ -290,6 +290,7 @@ an involved disclosed party. The current ambassadors list: AMD Tom Lendacky <thomas.lenda...@amd.com> Ampere Darren Hart <dar...@os.amperecomputing.com> ARM Catalin Marinas <catalin.mari...@arm.com> + IBM Power Madhavan Srinivasan <ma...@linux.ibm.com> IBM Z Christian Borntraeger <borntrae...@de.ibm.com> Intel Tony Luck <tony.l...@intel.com> Qualcomm Trilok Soni <quic_ts...@quicinc.com> diff --git a/Documentation/sound/codecs/cs35l56.rst b/Documentation/sound/codecs/cs35l56.rst index blahblah..blahblah 100644 --- a/Documentation/sound/codecs/cs35l56.rst +++ b/Documentation/sound/codecs/cs35l56.rst @@ -1,8 +1,8 @@ .. SPDX-License-Identifier: GPL-2.0-only -===================================================================== -Audio drivers for Cirrus Logic CS35L54/56/57 Boosted Smart Amplifiers -===================================================================== +======================================================================== +Audio drivers for Cirrus Logic CS35L54/56/57/63 Boosted Smart Amplifiers +======================================================================== :Copyright: 2025 Cirrus Logic, Inc. and Cirrus Logic International Semiconductor Ltd. @@ -13,11 +13,11 @@ Summary The high-level summary of this document is: -**If you have a laptop that uses CS35L54/56/57 amplifiers but audio is not +**If you have a laptop that uses CS35L54/56/57/63 amplifiers but audio is not working, DO NOT ATTEMPT TO USE FIRMWARE AND SETTINGS FROM ANOTHER LAPTOP, EVEN IF THAT LAPTOP SEEMS SIMILAR.** -The CS35L54/56/57 amplifiers must be correctly configured for the power +The CS35L54/56/57/63 amplifiers must be correctly configured for the power supply voltage, speaker impedance, maximum speaker voltage/current, and other external hardware connections. @@ -34,6 +34,7 @@ The cs35l56 drivers support: * CS35L54 * CS35L56 * CS35L57 +* CS35L63 There are two drivers in the kernel @@ -104,6 +105,13 @@ In this example the SSID is 10280c63. The format of the firmware file names is: +SoundWire (except CS35L56 Rev B0): + cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u? + +SoundWire CS35L56 Rev B0: + cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN + +Non-SoundWire (HDA and I2S): cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN Where: @@ -111,12 +119,18 @@ Where: * cs35lxx-b0 is the amplifier model and silicon revision. This information is logged by the driver during initialization. * SSID is the 8-digit hexadecimal SSID value. + * l?u? is the physical address on the SoundWire bus of the amp this + file applies to. * ampN is the amplifier number (for example amp1). This is the same as the prefix on the ALSA control names except that it is always lower-case in the file name. * spkidX is an optional part, used for laptops that have firmware configurations for different makes and models of internal speakers. +The CS35L56 Rev B0 continues to use the old filename scheme because a +large number of firmware files have already been published with these +names. + Sound Open Firmware and ALSA topology files ------------------------------------------- diff --git a/MAINTAINERS b/MAINTAINERS index blahblah..blahblah 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -207,7 +207,7 @@ X: arch/*/include/uapi/ X: include/uapi/ ABIT UGURU 1,2 HARDWARE MONITOR DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-hw...@vger.kernel.org S: Maintained F: drivers/hwmon/abituguru.c @@ -371,7 +371,7 @@ S: Maintained F: drivers/platform/x86/quickstart.c ACPI SERIAL MULTI INSTANTIATE DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained F: drivers/platform/x86/serial-multi-instantiate.c @@ -1157,7 +1157,6 @@ F: arch/x86/include/asm/amd/node.h F: arch/x86/kernel/amd_node.c AMD PDS CORE DRIVER -M: Shannon Nelson <shannon.nel...@amd.com> M: Brett Creeley <brett.cree...@amd.com> L: net...@vger.kernel.org S: Maintained @@ -3551,7 +3550,7 @@ F: arch/arm64/boot/Makefile F: scripts/make_fit.py ARM64 PLATFORM DRIVERS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com> R: Bryan O'Donoghue <bryan.odonog...@linaro.org> L: platform-driver-...@vger.kernel.org @@ -3712,7 +3711,7 @@ F: drivers/platform/x86/asus*.c F: drivers/platform/x86/eeepc*.c ASUS TF103C DOCK DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git @@ -4555,6 +4554,7 @@ BPF [NETWORKING] (tcx & tc BPF, sock_addr) M: Martin KaFai Lau <martin....@linux.dev> M: Daniel Borkmann <dan...@iogearbox.net> R: John Fastabend <john.fastab...@gmail.com> +R: Stanislav Fomichev <s...@fomichev.me> L: b...@vger.kernel.org L: net...@vger.kernel.org S: Maintained @@ -5613,14 +5613,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git F: drivers/usb/chipidea/ CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml F: drivers/input/touchscreen/chipone_icn8318.c CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: drivers/input/touchscreen/chipone_icn8505.c @@ -6254,6 +6254,7 @@ F: include/linux/cpuhotplug.h F: include/linux/smpboot.h F: kernel/cpu.c F: kernel/smpboot.* +F: rust/helper/cpu.c F: rust/kernel/cpu.rs CPU IDLE TIME MANAGEMENT FRAMEWORK @@ -6917,7 +6918,7 @@ F: include/dt-bindings/pmu/exynos_ppmu.h F: include/linux/devfreq-event.h DEVICE RESOURCE MANAGEMENT HELPERS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> R: Matti Vaittinen <mazziesacco...@gmail.com> S: Maintained F: include/linux/devm-helpers.h @@ -7516,7 +7517,7 @@ F: drivers/gpu/drm/gud/ F: include/drm/gud.h DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> S: Maintained T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/tiny/gm12u320.c @@ -7916,7 +7917,7 @@ F: drivers/gpu/drm/ci/xfails/vkms* F: drivers/gpu/drm/vkms/ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: dri-de...@lists.freedesktop.org S: Maintained T: git https://gitlab.freedesktop.org/drm/misc/kernel.git @@ -8317,7 +8318,7 @@ F: drivers/gpu/drm/panel/ F: include/drm/drm_panel.h DRM PRIVACY-SCREEN CLASS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: dri-de...@lists.freedesktop.org S: Maintained T: git https://gitlab.freedesktop.org/drm/misc/kernel.git @@ -9940,7 +9941,6 @@ F: drivers/fwctl/mlx5/ FWCTL PDS DRIVER M: Brett Creeley <brett.cree...@amd.com> -R: Shannon Nelson <shannon.nel...@amd.com> L: linux-ker...@vger.kernel.org S: Maintained F: drivers/fwctl/pds/ @@ -10221,7 +10221,7 @@ S: Maintained F: Documentation/devicetree/bindings/connector/gocontroll,moduline-module-slot.yaml GOODIX TOUCHSCREEN -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: drivers/input/touchscreen/goodix* @@ -10260,7 +10260,7 @@ F: include/dt-bindings/clock/google,gs101.h K: [gG]oogle.?[tT]ensor GPD POCKET FAN DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained F: drivers/platform/x86/gpd-pocket-fan.c @@ -10839,7 +10839,7 @@ S: Maintained F: drivers/dma/hisi_dma.c HISILICON GPIO DRIVER -M: Jay Fang <f.fangj...@huawei.com> +M: Yang Shen <shenyan...@huawei.com> L: linux-g...@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml @@ -11421,7 +11421,7 @@ F: drivers/i2c/busses/i2c-via.c F: drivers/i2c/busses/i2c-viapro.c I2C/SMBUS INTEL CHT WHISKEY COVE PMIC DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-cht-wc.c @@ -12011,13 +12011,13 @@ S: Supported F: sound/soc/intel/ INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained F: drivers/platform/x86/intel/atomisp2/pm.c INTEL ATOMISP2 LED DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained F: drivers/platform/x86/intel/atomisp2/led.c @@ -13678,7 +13678,7 @@ S: Maintained F: drivers/platform/x86/lenovo-wmi-hotkey-utilities.c LETSKETCH HID TABLET DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git @@ -13728,7 +13728,7 @@ F: drivers/ata/sata_gemini.c F: drivers/ata/sata_gemini.h LIBATA SATA AHCI PLATFORM devices support -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-...@vger.kernel.org S: Maintained F: drivers/ata/ahci_platform.c @@ -13798,7 +13798,7 @@ M: Oliver O'Halloran <ooh...@gmail.com> L: nvd...@lists.linux.dev S: Supported Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ -F: Documentation/devicetree/bindings/pmem/pmem-region.txt +F: Documentation/devicetree/bindings/pmem/pmem-region.yaml F: drivers/nvdimm/of_pmem.c LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM @@ -14098,7 +14098,7 @@ F: Documentation/admin-guide/ldm.rst F: block/partitions/ldm.* LOGITECH HID GAMING KEYBOARDS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git @@ -14780,7 +14780,7 @@ F: Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml F: drivers/power/supply/max17040_battery.c MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS -R: Hans de Goede <hdego...@redhat.com> +R: Hans de Goede <ha...@kernel.org> R: Krzysztof Kozlowski <k...@kernel.org> R: Marek Szyprowski <m.szyprow...@samsung.com> R: Sebastian Krzyszkowiak <sebastian.krzyszkow...@puri.sm> @@ -15582,7 +15582,7 @@ Q: https://patchwork.kernel.org/project/netdevbpf/list/ F: drivers/net/ethernet/mellanox/mlxfw/ MELLANOX HARDWARE PLATFORM SUPPORT -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com> M: Vadim Pasternak <vad...@nvidia.com> L: platform-driver-...@vger.kernel.org @@ -15919,6 +15919,7 @@ R: Liam R. Howlett <liam.howl...@oracle.com> R: Nico Pache <npa...@redhat.com> R: Ryan Roberts <ryan.robe...@arm.com> R: Dev Jain <dev.j...@arm.com> +R: Barry Song <bao...@kernel.org> L: linux...@kvack.org S: Maintained W: http://www.linux-mm.org @@ -16538,7 +16539,7 @@ S: Maintained F: drivers/platform/surface/surface_gpe.c MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com> M: Maximilian Luz <luzmaximil...@gmail.com> L: platform-driver-...@vger.kernel.org @@ -17493,7 +17494,7 @@ F: tools/testing/selftests/net/srv6* NETWORKING [TCP] M: Eric Dumazet <eduma...@google.com> M: Neal Cardwell <ncardw...@google.com> -R: Kuniyuki Iwashima <kun...@amazon.com> +R: Kuniyuki Iwashima <kun...@google.com> L: net...@vger.kernel.org S: Maintained F: Documentation/networking/net_cachelines/tcp_sock.rst @@ -17523,7 +17524,7 @@ F: net/tls/* NETWORKING [SOCKETS] M: Eric Dumazet <eduma...@google.com> -M: Kuniyuki Iwashima <kun...@amazon.com> +M: Kuniyuki Iwashima <kun...@google.com> M: Paolo Abeni <pab...@redhat.com> M: Willem de Bruijn <will...@google.com> S: Maintained @@ -17538,7 +17539,7 @@ F: net/core/scm.c F: net/socket.c NETWORKING [UNIX SOCKETS] -M: Kuniyuki Iwashima <kun...@amazon.com> +M: Kuniyuki Iwashima <kun...@google.com> S: Maintained F: include/net/af_unix.h F: include/net/netns/unix.h @@ -17706,7 +17707,7 @@ F: tools/include/nolibc/ F: tools/testing/selftests/nolibc/ NOVATEK NVT-TS I2C TOUCHSCREEN DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml @@ -19376,7 +19377,7 @@ F: crypto/pcrypt.c F: include/crypto/pcrypt.h PDS DSC VIRTIO DATA PATH ACCELERATOR -R: Shannon Nelson <shannon.nel...@amd.com> +R: Brett Creeley <brett.cree...@amd.com> F: drivers/vdpa/pds/ PECI HARDWARE MONITORING DRIVERS @@ -19398,7 +19399,6 @@ F: include/linux/peci-cpu.h F: include/linux/peci.h PENSANDO ETHERNET DRIVERS -M: Shannon Nelson <shannon.nel...@amd.com> M: Brett Creeley <brett.cree...@amd.com> L: net...@vger.kernel.org S: Maintained @@ -22171,7 +22171,7 @@ R: Tejun Heo <t...@kernel.org> R: David Vernet <v...@manifault.com> R: Andrea Righi <ari...@nvidia.com> R: Changwoo Min <chang...@igalia.com> -L: linux-ker...@vger.kernel.org +L: sched-...@lists.linux.dev S: Maintained W: https://github.com/sched-ext/scx T: git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git @@ -22708,7 +22708,7 @@ K: fu[57]40 K: [^@]sifive SILEAD TOUCHSCREEN DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org L: platform-driver-...@vger.kernel.org S: Maintained @@ -22741,7 +22741,7 @@ F: Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml F: drivers/i3c/master/svc-i3c-master.c SIMPLEFB FB DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-fb...@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/display/simple-framebuffer.yaml @@ -22870,7 +22870,7 @@ F: Documentation/hwmon/emc2103.rst F: drivers/hwmon/emc2103.c SMSC SCH5627 HARDWARE MONITOR DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-hw...@vger.kernel.org S: Supported F: Documentation/hwmon/sch5627.rst @@ -23525,7 +23525,7 @@ S: Supported F: Documentation/process/stable-kernel-rules.rst STAGING - ATOMISP DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Mauro Carvalho Chehab <mche...@kernel.org> R: Sakari Ailus <sakari.ai...@linux.intel.com> L: linux-me...@vger.kernel.org @@ -23661,7 +23661,6 @@ F: include/dt-bindings/clock/starfive?jh71*.h STARFIVE JH71X0 PINCTRL DRIVERS M: Emil Renner Berthing <ker...@esmil.dk> -M: Jianlong Huang <jianlong.hu...@starfivetech.com> M: Hal Feng <hal.f...@starfivetech.com> L: linux-g...@vger.kernel.org S: Maintained @@ -23822,7 +23821,7 @@ F: arch/m68k/sun3*/ F: drivers/net/ethernet/i825xx/sun3* SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml @@ -25590,7 +25589,7 @@ F: Documentation/hid/hiddev.rst F: drivers/hid/usbhid/ USB INTEL XHCI ROLE MUX DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-...@vger.kernel.org S: Maintained F: drivers/usb/roles/intel-xhci-usb-role-switch.c @@ -25781,7 +25780,7 @@ F: Documentation/firmware-guide/acpi/intel-pmc-mux.rst F: drivers/usb/typec/mux/intel_pmc_mux.c USB TYPEC PI3USB30532 MUX DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-...@vger.kernel.org S: Maintained F: drivers/usb/typec/mux/pi3usb30532.c @@ -25810,7 +25809,7 @@ F: drivers/usb/host/uhci* USB VIDEO CLASS M: Laurent Pinchart <laurent.pinch...@ideasonboard.com> -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-me...@vger.kernel.org S: Maintained W: http://www.ideasonboard.org/uvc/ @@ -26341,7 +26340,7 @@ F: include/uapi/linux/virtio_snd.h F: sound/virtio/* VIRTUAL BOX GUEST DEVICE DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Arnd Bergmann <a...@arndb.de> M: Greg Kroah-Hartman <gre...@linuxfoundation.org> S: Maintained @@ -26350,7 +26349,7 @@ F: include/linux/vbox_utils.h F: include/uapi/linux/vbox*.h VIRTUAL BOX SHARED FOLDER VFS DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-fsde...@vger.kernel.org S: Maintained F: fs/vboxsf/* @@ -26604,7 +26603,7 @@ F: drivers/mmc/host/wbsd.* WACOM PROTOCOL 4 SERIAL TABLETS M: Julian Squires <jul...@cipht.net> -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: linux-in...@vger.kernel.org S: Maintained F: drivers/input/tablet/wacom_serial4.c @@ -26771,7 +26770,7 @@ F: include/linux/wwan.h F: include/uapi/linux/wwan.h X-POWERS AXP288 PMIC DRIVERS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> S: Maintained F: drivers/acpi/pmic/intel_pmic_xpower.c N: axp288 @@ -26863,14 +26862,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm F: arch/x86/mm/ X86 PLATFORM ANDROID TABLETS DSDT FIXUP DRIVER -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> L: platform-driver-...@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git F: drivers/platform/x86/x86-android-tablets/ X86 PLATFORM DRIVERS -M: Hans de Goede <hdego...@redhat.com> +M: Hans de Goede <ha...@kernel.org> M: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com> L: platform-driver-...@vger.kernel.org S: Maintained @@ -26967,6 +26966,7 @@ M: David S. Miller <da...@davemloft.net> M: Jakub Kicinski <k...@kernel.org> M: Jesper Dangaard Brouer <h...@kernel.org> M: John Fastabend <john.fastab...@gmail.com> +R: Stanislav Fomichev <s...@fomichev.me> L: net...@vger.kernel.org L: b...@vger.kernel.org S: Supported @@ -26988,6 +26988,7 @@ M: Björn Töpel <bj...@kernel.org> M: Magnus Karlsson <magnus.karls...@intel.com> M: Maciej Fijalkowski <maciej.fijalkow...@intel.com> R: Jonathan Lemon <jonathan.le...@gmail.com> +R: Stanislav Fomichev <s...@fomichev.me> L: net...@vger.kernel.org L: b...@vger.kernel.org S: Maintained diff --git a/Makefile b/Makefile index blahblah..blahblah 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 6 PATCHLEVEL = 16 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Baby Opossum Posse # *DOCUMENTATION* @@ -22,18 +22,6 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ PHONY := __all __all: -# Set RHEL variables -# Note that this ifdef'ery is required to handle when building with -# the O= mechanism (relocate the object file results) due to upstream -# commit 67d7c302 which broke our RHEL include file -ifneq ($(realpath source),) -include $(realpath source)/Makefile.rhelver -else -ifneq ($(realpath Makefile.rhelver),) -include Makefile.rhelver -endif -endif - # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # @@ -1321,6 +1309,8 @@ uapi-asm-generic: # Generate some files # --------------------------------------------------------------------------- +include $(srctree)/Makefile.rhelver + # KERNELRELEASE can change from a few different places, meaning version.h # needs to be updated, so this check is forced on all builds @@ -1861,12 +1851,9 @@ rustfmtcheck: rustfmt # Misc # --------------------------------------------------------------------------- -# Run misc checks when ${KBUILD_EXTRA_WARN} contains 1 PHONY += misc-check -ifneq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) misc-check: $(Q)$(srctree)/scripts/misc-check -endif all: misc-check diff --git a/Makefile.rhelver b/Makefile.rhelver index blahblah..blahblah 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 18 +RHEL_RELEASE = 29 # # RHEL_REBASE_NUM @@ -78,3 +78,13 @@ ifneq ("$(ZSTREAM)", "yes") RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE) endif endif + +# +# Automotive +# ---------- +# +# Represents the major and minor release used by automotive. +# Primarily this is used to to identify the build target when +# building the kernel-automotive packages. +AUTOMOTIVE_MAJOR = 2 +AUTOMOTIVE_MINOR = 99 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h index blahblah..blahblah 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -327,7 +327,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) -static inline int pte_swp_exclusive(pte_t pte) +static inline bool pte_swp_exclusive(pte_t pte) { return pte_val(pte) & _PAGE_SWP_EXCLUSIVE; } diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index blahblah..blahblah 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -144,7 +144,7 @@ #define ARC_AUX_AGU_MOD2 0x5E2 #define ARC_AUX_AGU_MOD3 0x5E3 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <soc/arc/arc_aux.h>
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3857 -- _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue