Greg Kroah-Hartman 002bba562d Merge tag 'android14-6.1.90_r00' into android14-6.1
This merges up to the 6.1.90 LTS release into the android14-6.1 branch.
Included in here are the following commits:

* c034535679 Revert "macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads"
* 35df421fc4 Revert "macsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst"
* f17db53dd9 Revert "net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec"
*   62184d7812 Merge 6.1.90 into android14-6.1-lts
|\
| * 909ba1f1b4 Linux 6.1.90
| * ca817d44be net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec
| * 21e042d29e macsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst
| * 6536f12fe2 macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads
| * 9b7c5004d7 bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS
| * 4e75e222d3 i2c: smbus: fix NULL function pointer dereference
| * 25b3498485 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered
| * 4201b8c8f2 riscv: Fix TASK_SIZE on 64-bit NOMMU
| * 0b947c90e3 riscv: fix VMALLOC_START definition
| * 023b6390a1 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms
| * 8bf5741832 dma: xilinx_dpdma: Fix locking
| * e71d5ec7c0 phy: rockchip-snps-pcie3: fix clearing PHP_GRF_PCIESEL_CON bits
| * 199895b8b6 phy: rockchip-snps-pcie3: fix bifurcation on rk3588
| * 4723dfe76d phy: freescale: imx8m-pcie: fix pcie link-up instability
| * ed4b981b1d phy: freescale: imx8m-pcie: Refine i.MX8MM PCIe PHY driver
| * d6a6bacd0a phy: marvell: a3700-comphy: Fix hardcoded array size
| * 976df695f5 phy: marvell: a3700-comphy: Fix out of bounds read
| * 2203a447fd idma64: Don't try to serve interrupts when device is powered off
| * 33d8e3e5f3 dmaengine: tegra186: Fix residual calculation
| * 56bce3fcf8 dmaengine: owl: fix register access functions
| * a8e8c79ed2 x86/tdx: Preserve shared bit on mprotect()
| * 2bd852307f rust: remove `params` from `module` macro example
| * ad371d69a6 mtd: diskonchip: work around ubsan link failure
| * 4ebf1ff60e udp: preserve the connected status if only UDP cmsg
| * e3f0519da4 fbdev: fix incorrect address computation in deferred IO
| * d0205d6e0a stackdepot: respect __GFP_NOLOCKDEP allocation flag
| * c35fc18071 net: b44: set pause params only when interface is up
| * 8e2c583c26 ethernet: Add helper for assigning packet type when dest address does not match device address
| * ba234a54ee ACPI: CPPC: Fix access width used for PCC registers
| * 0f708a7e0a ACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro
| * 01fc53be67 ACPI: CPPC: Use access_width over bit_width for system memory accesses
| * dd681710ab irqchip/gic-v3-its: Prevent double free on error
| * 64f9d8ac2c drm/amdgpu: Fix leak when GPU memory allocation fails
| * 404b0ae432 drm/amdgpu/sdma5.2: use legacy HDP flush for SDMA2/3
| * ffddf569e3 arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma
| * ba9bcc0e58 LoongArch: Fix access error when read fault on a write-only VMA
| * 94021d1d2b LoongArch: Fix callchain parse error with kernel tracepoint events
| * 38f17d1fbb cpu: Re-enable CPU mitigations by default for !X86 architectures
| * 8bdbcfaf3e btrfs: fix information leak in btrfs_ioctl_logical_to_ino()
| * 0561b65fbd HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up
| * c7a4bca289 smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
| * 2b8bf690e0 smb: client: Fix struct_group() usage in __packed structs
| * a957ea5aa3 mmc: sdhci-msm: pervent access to suspended controller
| * e60502b907 Bluetooth: qca: fix NULL-deref on non-serdev suspend
| * e6dd0117e9 Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853
| * c788236289 Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
| * 4e6cd21498 rust: make mutually exclusive with CFI_CLANG
| * 9f882077f5 rust: don't select CONSTRUCTORS
| * 6a190e7ca4 x86/cpu: Fix check for RDPKRU in __show_regs()
| * 0c42f7e039 fork: defer linking file vma until vma is fully initialized
| * 539a2b995a virtio_net: Do not send RSS key if it is not supported
| * 34410fcad9 Revert "crypto: api - Disallow identical driver names"
| * b3686200ad cifs: Replace remaining 1-element arrays
| * 2ceacda270 af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().
| * f05caed833 net: ethernet: ti: am65-cpts: Fix PTPv1 message type on TX packets
| * 777d7d0049 iavf: Fix TC config comparison with existing adapter TC config
| * 81ad28ac21 i40e: Report MFS in decimal base instead of hex
| * 152ed360cf i40e: Do not use WQ_MEM_RECLAIM flag for workqueue
| * 13ba94f6cc netfilter: nf_tables: honor table dormant flag from netdev release event path
| * e325357440 eth: bnxt: fix counting packets discarded due to OOM and netpoll
| * 5bfe7bf965 mlxsw: spectrum_acl_tcam: Fix memory leak when canceling rehash work
| * 4526a56e02 mlxsw: spectrum_acl_tcam: Fix incorrect list API usage
| * 751d352858 mlxsw: spectrum_acl_tcam: Fix warning during rehash
| * b822644fd9 mlxsw: spectrum_acl_tcam: Fix memory leak during rehash
| * 78884187c0 mlxsw: spectrum_acl_tcam: Rate limit error message
| * 813e2ab753 mlxsw: spectrum_acl_tcam: Fix possible use-after-free during rehash
| * b996e8699d mlxsw: spectrum_acl_tcam: Fix possible use-after-free during activity update
| * 19ebdce660 mlxsw: spectrum_acl_tcam: Fix race during rehash delayed work
| * bca6fa2d9a net: openvswitch: Fix Use-After-Free in ovs_ct_exit
| * f4861f052f ipvs: Fix checksumming on GSO of SCTP packets
| * 4115403dc9 Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()
| * 31f18a1f58 Bluetooth: hci_sync: Using hci_cmd_sync_submit when removing Adv Monitor
| * 14051cbcf3 Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID
| * 25a1c2d4b1 net: gtp: Fix Use-After-Free in gtp_dellink
| * 5e5e1865b7 net: usb: ax88179_178a: stop lying about skb->truesize
| * 7a25bfd127 ipv4: check for NULL idev in ip_route_use_hint()
| * 1e9b694597 net: fix sk_memory_allocated_{add|sub} vs softirqs
| * 82810873ac net: make SK_MEMORY_PCPU_RESERV tunable
| * 0d14f10402 ax25: Fix netdev refcount issue
| * 424c69dbb2 NFC: trf7970a: disable all regulators on removal
| * 25a82005d5 bnxt_en: Fix the PCI-AER routines
| * b20beb0598 bnxt_en: refactor reset close code
| * 16be600293 bridge/br_netlink.c: no need to return void function
| * 599c9ad5e1 icmp: prevent possible NULL dereferences from icmp_build_probe()
| * d3c4b14c8a ARM: dts: microchip: at91-sama7g5ek: Replace regulator-suspend-voltage with the valid property
| * 3f7ecad54c mlxsw: core: Unregister EMAD trap using FORWARD action
| * 9064163f1c vxlan: drop packets from invalid src-address
| * 9b9c4adad6 wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd
| * d20e3beb83 wifi: iwlwifi: mvm: remove old PASN station when adding a new one
| * bab058e31a ARC: [plat-hsdk]: Remove misplaced interrupt-cells property
| * 0277e73e8e arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro
| * af45b5bc30 arm64: dts: mediatek: mt2712: fix validation errors
| * 1aea205a42 arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block
| * d078de8674 arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"
| * da3c0740f0 arm64: dts: mediatek: mt7622: fix IR nodename
| * ce782b5a74 arm64: dts: mediatek: mt7622: fix clock controllers
| * 818f56a8b3 arm64: dts: mediatek: mt8195-cherry: Update min voltage constraint for MT6315
| * 942debbea5 arm64: dts: mediatek: mt8192-asurada: Update min voltage constraint for MT6315
| * e8ac4490db arm64: dts: mediatek: mt8195: Add missing gce-client-reg to mutex
| * 5bcfc53373 arm64: dts: mediatek: mt8195: Add missing gce-client-reg to vpp/vdosys
| * 18548e2ab9 arm64: dts: mediatek: mt8192: Add missing gce-client-reg to mutex
| * 2f83d4763a arm64: dts: mediatek: mt8183: Add power-domains properity to mfgcfg
| * 475816446f arm64: dts: rockchip: Remove unsupported node from the Pinebook Pro dts
| * 076ff06a1e arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma
| * aa1af71dee arm64: dts: rockchip: fix alphabetical ordering RK3399 puma
| * cb5b05e619 arm64: dts: rockchip: enable internal pull-up on Q7_USB_ID for RK3399 Puma
| * 9ab1d84bdb arm64: dts: rockchip: set PHY address of MT7531 switch to 0x1f
| * 526facda61 HID: logitech-dj: allow mice to use all types of reports
| * 6b0ac25f36 HID: intel-ish-hid: ipc: Fix dev_err usage with uninitialized dev->devc
| * 4f83ca4c7a cifs: reinstate original behavior again for forceuid/forcegid
| * e24e165190 smb: client: fix rename(2) regression against samba
* | beb491c1c2 Merge 6.1.89 into android14-6.1-lts
|\|
| * dcbc050cb0 Linux 6.1.89
| * 8a5291736e Revert "ASoC: ti: Convert Pandora ASoC to GPIO descriptors"
* | 3b75c4ca77 ANDROID: update .stg for change to struct clk_core
* | 077eb0a09d Revert "usb: xhci: Add timeout argument in address_device USB HCD callback"
* | 992f4a2013 Merge 6.1.88 into android14-6.1-lts
|\|
| * f2295faba5 Linux 6.1.88
| * 0f7908a016 PCI/ASPM: Fix deadlock when enabling ASPM
| * 67a877128b ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
| * 4687606d94 ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
| * 21ff9d7d22 ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
| * b80ba64871 ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
| * 7d51db455c net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
| * 41a004ffba net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
| * d9c2f69cc1 net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
| * 013c787d23 net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
| * 897ac5306b nilfs2: fix OOB in nilfs_set_de_type
| * 1e7feb31a1 bootconfig: use memblock_free_late to free xbc memory to buddy
| * ad74d208f2 nouveau: fix instmem race condition around ptr stores
| * bcff1ed2ff drm/vmwgfx: Fix crtc's atomic check conditional
| * 8f79b42d1c drm/vmwgfx: Sort primary plane formats by order of preference
| * 212e3baccd drm/amdgpu: validate the parameters of bo mapping operations more clearly
| * 5ef7ba2799 mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
| * 76c2f4d426 init/main.c: Fix potential static_command_line memory overflow
| * f7e71a7cf3 arm64: hibernate: Fix level3 translation fault in swsusp_save()
| * e09465aecc KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
| * 0fb74c00d1 KVM: x86/pmu: Disable support for adaptive PEBS
| * e487b8eccf KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
| * 5d43e07228 fs: sysfs: Fix reference leak in sysfs_break_active_protection()
| * 89af25bd4b speakup: Avoid crash on very long word
| * 7c6f941492 mei: me: disable RPL-S on SPS and IGN firmwares
| * 0588bbbd71 usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
| * a676b17edb usb: Disable USB3 LPM at shutdown
| * 9de10b59d1 usb: dwc2: host: Fix dereference issue in DDMA completion flow.
| * 8672ad663a Revert "usb: cdc-wdm: close race between read and workqueue"
| * 4ed7c7720a USB: serial: option: add Telit FN920C04 rmnet compositions
| * 19f98f214b USB: serial: option: add Rolling RW101-GL and RW135-GL support
| * 25a299c566 USB: serial: option: support Quectel EM060K sub-models
| * 9eba075025 USB: serial: option: add Lonsung U8300/U9300 product
| * 3e34029b3c USB: serial: option: add support for Fibocom FM650/FG650
| * 3c4ba8a6c5 USB: serial: option: add Fibocom FM135-GL variants
| * 282b223cfd serial: stm32: Reset .throttled state in .startup()
| * 87d15af82d serial: stm32: Return IRQ_NONE in the ISR if no handling happend
| * bbaafbb465 serial/pmac_zilog: Remove flawed mitigation for rx irq flood
| * 2c9b943e99 serial: mxs-auart: add spinlock around changing cts state
| * ac882d6b21 comedi: vmk80xx: fix incomplete endpoint checking
| * 9eae1facfc thunderbolt: Fix wake configurations after device unplug
| * 38e10c9faa thunderbolt: Avoid notify PM core about runtime PM resume
| * a6d2a8b211 binder: check offset alignment in binder_get_object()
| * d05380576f ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
| * 943c3e45c8 x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
| * d17075a935 x86/bugs: Fix BHI retpoline check
| * 165d226472 clk: mediatek: Do a runtime PM get on controllers during probe
| * c1d87d56af clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
| * a4fe8813a7 clk: mediatek: clk-mux: Propagate struct device for mtk-mux
| * 6f5f72a684 clk: mediatek: clk-mtk: Propagate struct device for composites
| * 082b831488 clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates()
| * 647a25b07d clk: mediatek: mt8192: Propagate struct device for gate clocks
| * 0904f9ef91 clk: mediatek: mt8192: Correctly unregister and free clocks on failure
| * 83ada89e4a clk: Get runtime PM before walking tree for clk_summary
| * 5a704c267a clk: Show active consumers of clocks in debugfs
| * 5833b99cf8 clk: remove unnecessary (void*) conversions
| * a424e713e0 clk: Get runtime PM before walking tree during disable_unused
| * 5558b3b68c clk: Initialize struct clk_core kref earlier
| * 43bc4cfef2 clk: Print an info line before disabling unused clocks
| * 349dbfd65f clk: Remove prepare_lock hold assertion in __clk_release()
| * f6ac4fdfa5 usb: new quirk to reduce the SET_ADDRESS request timeout
| * 5f9b63193b usb: xhci: Add timeout argument in address_device USB HCD callback
| * 1d011d972f drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
| * 7989b04d6c ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
| * 39f932d295 PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
| * 636f0fdb36 PCI/DPC: Use FIELD_GET()
| * aedbd09614 ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
| * 03bfe0e936 ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
| * 7c02a4a6cc ALSA: scarlett2: Add correct product series name to messages
| * b928cde9c0 ALSA: scarlett2: Default mixer driver to enabled
| * 0f4048e1a0 ASoC: ti: Convert Pandora ASoC to GPIO descriptors
| * e2b8480b70 ALSA: scarlett2: Add support for Clarett 8Pre USB
| * 4d74cb9cdf ALSA: scarlett2: Move USB IDs out from device_info struct
| * bbdfa14482 PCI: switchtec: Add support for PCIe Gen5 devices
| * 87709f7ecd PCI: switchtec: Use normal comment style
| * 89a9196aec PCI: Execute quirk_enable_clear_retrain_link() earlier
| * caa7ff1d7d thunderbolt: Add debug log for link controller power quirk
| * 932a765100 thunderbolt: Log function name of the called quirk
| * 4b7ed2400e x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
| * f4aae2afe2 PCI: Delay after FLR of Solidigm P44 Pro NVMe
| * 0fe6a97a5f usb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info()
| * c96b07dca1 HID: kye: Sort kye devices
| * 57aadcc028 PCI: Avoid FLR for SolidRun SNET DPU rev 1
| * 3c55d4396b ARM: omap2: n8x0: stop instantiating codec platform data
| * c330a13ab7 drm/panel: visionox-rm69299: don't unregister DSI device
| * 5fd4b09030 drm: nv04: Fix out of bounds access
| * 559f3a6333 s390/cio: fix race condition during online processing
| * beb3ff19a5 s390/qdio: handle deferred cc1
| * fe446927f8 RDMA/mlx5: Fix port number for counter query in multi-port configuration
| * ea42dbe759 RDMA/cm: Print the old state when cm_destroy_id gets timeout
| * 196617d07d RDMA/rxe: Fix the problem "mutex_destroy missing"
| * 45e811bab2 net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
| * e86c9db58e net: dsa: mt7530: fix mirroring frames received on local port
| * 62e27ef18e tun: limit printing rate when illegal packet received by tun dev
| * 6a6ebec408 ice: tc: allow zero flags in parsing tc flower
| * 46efa4d593 net/mlx5e: Prevent deadlock while disabling aRFS
| * 8635ac7dd9 net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
| * ba0db46385 af_unix: Don't peek OOB data without MSG_OOB.
| * a1d3e3521f af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
| * f1c3c61701 netfilter: flowtable: incorrect pppoe tuple
| * 8bf7c76a2a netfilter: flowtable: validate pppoe header
| * 41d8fdf3af netfilter: nft_set_pipapo: do not free live element
| * b13db0d16b netfilter: br_netfilter: skip conntrack input hook for promisc packets
| * df7c0fb8c2 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
| * 8d56bad42a netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
| * 408a43b6c9 x86/efistub: Remap kernel text read-only before dropping NX attribute
| * f56faf87c1 x86/sev: Move early startup code into .head.text section
| * d6f5bc5ff0 x86/sme: Move early SME kernel encryption handling into .head.text
| * e6489cc45f x86/head/64: Move the __head definition to <asm/init.h>
| * bbcd0534a3 x86/head/64: Add missing __head annotation to startup_64_load_idt()
| * 20dc656b06 x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
| * d327e96157 x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
| * c4421279b6 x86/boot: Increase section and file alignment to 4k/512
| * 581f5d5e02 x86/boot: Split off PE/COFF .data section
| * 43b1920588 x86/boot: Drop PE/COFF .reloc section
| * d03399c3e2 x86/boot: Construct PE/COFF .text section from assembler
| * 1fa0a21475 x86/boot: Derive file size from _edata symbol
| * 1c754c6ec9 x86/boot: Define setup size in linker script
| * f9d68334dd x86/boot: Set EFI handover offset directly in header asm
| * e1380c923c x86/boot: Grab kernel_info offset from zoffset header directly
| * 67b8dc5089 x86/boot: Drop references to startup_64
| * 33d38d9b35 x86/boot: Drop redundant code setting the root device
| * 5c3e92ad49 x86/boot: Omit compression buffer from PE/COFF image memory footprint
| * f31f521ad2 x86/boot: Remove the 'bugger off' message
| * 0db16d1dce x86/efi: Drop alignment flags from PE section headers
| * 1800c9628e x86/efistub: Reinstate soft limit for initrd loading
| * f46e0e9fbe x86/efi: Disregard setup header of loaded image
| * f5603f9e13 x86/efi: Drop EFI stub .bss from .data section
| * 704edc9252 drm/i915/vma: Fix UAF on destroy against retire race
| * add0ff3486 net: usb: ax88179_178a: avoid writing the mac address before first reading
| * 07b37f227c random: handle creditable entropy from atomic process context
| * bcdd9ce78d selftests/ftrace: Limit length in subsystem-enable tests
| * 45eec81eac SUNRPC: Fix rpcgss_context trace event acceptor field
| * cbe7b911e0 io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
| * 121a83be21 drm/amd/display: Do not recursively call manual trigger programming
| * 01c227f5a7 drm/amdgpu: fix incorrect number of active RBs for gfx11
| * 87f8aac740 drm/amdgpu: fix incorrect active rb bitmap for gfx11
| * 1e05339968 drm/vmwgfx: Enable DMA mappings with SEV
* | af0a15ff84 Merge 6.1.87 into android14-6.1-lts
|\|
| * 6741e066ec Linux 6.1.87
| * 724fbc7c0c drm/amd/display: fix disable otg wa logic in DCN316
| * 90819b1830 drm/amdgpu: always force full reset for SOC21
| * 7cc89dbcb8 drm/amdgpu: Reset dGPU if suspend got aborted
| * 29bd4d05f2 drm/i915: Disable port sync when bigjoiner is used
| * 2bc1796f8e drm/i915/cdclk: Fix CDCLK programming order when pipes are active
| * d844df1100 x86/bugs: Replace CONFIG_SPECTRE_BHI_{ON,OFF} with CONFIG_MITIGATION_SPECTRE_BHI
| * 7f18a0df76 x86/bugs: Remove CONFIG_BHI_MITIGATION_AUTO and spectre_bhi=auto
| * d737d8cd8e x86/bugs: Clarify that syscall hardening isn't a BHI mitigation
| * 4b0b5d621e x86/bugs: Fix BHI handling of RRSBA
| * dc2db3e978 x86/bugs: Rename various 'ia32_cap' variables to 'x86_arch_cap_msr'
| * b1b32586f7 x86/bugs: Cache the value of MSR_IA32_ARCH_CAPABILITIES
| * 662e341e57 x86/bugs: Fix BHI documentation
| * 0d433e4082 x86/bugs: Fix return type of spectre_bhi_state()
| * d447d8de84 irqflags: Explicitly ignore lockdep_hrtimer_exit() argument
| * 22f51ddb0c x86/apic: Force native_apic_mem_read() to use the MOV instruction
| * 881b495ed2 selftests: timers: Fix abs() warning in posix_timers test
| * 9c09773917 x86/cpu: Actually turn off mitigations by default for SPECULATION_MITIGATIONS=n
| * 0c182182d6 perf/x86: Fix out of range data
| * a2c1c0cfab vhost: Add smp_rmb() in vhost_enable_notify()
| * f6e2d61dc1 vhost: Add smp_rmb() in vhost_vq_avail_empty()
| * 18c8cc6680 drm/client: Fully protect modes[] with dev->mode_config.mutex
| * 8a6fea3fcb drm/ast: Fix soft lockup
| * d29b50a32c drm/amdkfd: Reset GPU on queue preemption failure
| * 4b53d7d620 drm/i915/vrr: Disable VRR when using bigjoiner
| * 62029bc9ff kprobes: Fix possible use-after-free issue on kprobe registration
| * 88dd8bb129 io_uring/net: restore msg_control on sendzc retry
| * c00146b399 btrfs: qgroup: convert PREALLOC to PERTRANS after record_root_in_trans
| * 06fe999854 btrfs: record delayed inode root in transaction
| * cb3131b5a2 btrfs: qgroup: correctly model root qgroup rsv in convert
| * 5f1205b86b iommu/vt-d: Allocate local memory for page request queue
| * 91580ea48b tracing: hide unused ftrace_event_id_fops
| * 19ff8fed33 net: ena: Fix incorrect descriptor free behavior
| * 7d44e12efb net: ena: Wrong missing IO completions check order
| * 4dea83d483 net: ena: Fix potential sign extension issue
| * b75722be42 af_unix: Fix garbage collector racing against connect()
| * fb6d14e23d af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
| * 19643bf8c9 net: dsa: mt7530: trap link-local frames regardless of ST Port State
| * 8edb087c44 net: sparx5: fix wrong config being used when reconfiguring PCS
| * 88a50c8a50 net/mlx5e: HTB, Fix inconsistencies with QoS SQs number
| * ad26f26abd net/mlx5e: Fix mlx5e_priv_init() cleanup flow
| * 2e8dc5cffc net/mlx5: Properly link new fs rules into the tree
| * c760089aa9 netfilter: complete validation of user input
| * 9d42f37339 Bluetooth: L2CAP: Fix not validating setsockopt user input
| * 7bc65d23ba Bluetooth: SCO: Fix not validating setsockopt user input
| * de76ae9ea1 ipv6: fix race condition between ipv6_get_ifaddr and ipv6_del_addr
| * 03d564999f ipv4/route: avoid unused-but-set-variable warning
| * 2c46877f5f ipv6: fib: hide unused 'pn' variable
| * 7e33f68791 octeontx2-af: Fix NIX SQ mode and BP config
| * 84a352b7eb af_unix: Clear stale u->oob_skb.
| * 492337a4fb net: ks8851: Handle softirqs at the end of IRQ thread to fix hang
| * be03315452 net: ks8851: Inline ks8851_rx_skb()
| * ecedcd7e39 bnxt_en: Reset PTP tx_avail after possible firmware reset
| * 4a1b65d1e5 geneve: fix header validation in geneve[6]_xmit_skb
| * 2a523f14a3 xsk: validate user input for XDP_{UMEM|COMPLETION}_FILL_RING
| * ac1c10b4eb u64_stats: fix u64_stats_init() for lockdep when used repeatedly in one file
| * 0b44500559 net: openvswitch: fix unwanted error log on timeout policy probing
| * 9fc74e367b scsi: qla2xxx: Fix off by one in qla_edif_app_getstats()
| * 438b9a71b2 scsi: hisi_sas: Modify the deadline for ata_wait_after_reset()
| * b7dc2e6b87 nouveau: fix function cast warning
| * 84fb600635 Revert "drm/qxl: simplify qxl_fence_wait"
| * 24c0c5867a arm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order
| * 49054b3ed2 media: cec: core: remove length check of Timer Status
| * bccc8d1550 PM: s2idle: Make sure CPUs will wakeup directly on resume
| * bd9b94055c drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11
| * 66fab1e120 Bluetooth: Fix memory leak in hci_req_sync_complete()
| * 2d5f12de4c ring-buffer: Only update pages_touched when a new page is touched
| * 3fe79b2c83 batman-adv: Avoid infinite loop trying to resize local TT
| * 0559b2d759 ata: libata-scsi: Fix ata_scsi_dev_rescan() error path
| * ca5962bdc5 smb3: fix Open files on server counter going negative
* | 37db5a6cac Reapply "scsi: core: Add struct for args to execution functions"
* | faf34a67eb Merge 6.1.86 into android14-6.1-lts
|\|
| * cd5d98c055 Linux 6.1.86
| * c5f9fe2c1e Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
| * eea65ed738 VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
| * cea93dae3e net: mpls: error out if inner headers are not set
| * 21f5cfed1e Bluetooth: btintel: Fixe build regression
| * 00e34ff1ce platform/x86: intel-vbtn: Update tablet mode switch at end of probe
| * e80b4980af randomize_kstack: Improve entropy diffusion
| * 649e564636 virtio: reenable config if freezing device failed
| * 3a9c459091 scsi: sd: usb_storage: uas: Access media prior to querying device properties
| * 345b6b8319 Revert "scsi: core: Add struct for args to execution functions"
| * f1465ff4c8 Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties"
| * cf0650adb6 gcc-plugins/stackleak: Avoid .head.text section
| * 2b85977977 tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
| * 2aeb805a1b netfilter: nf_tables: discard table flag update with pending basechain deletion
| * 8d3a58af50 netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
| * fcd1993a29 netfilter: nf_tables: release batch on table validation from abort path
| * 664206ff8b fbmon: prevent division by zero in fb_videomode_from_videomode()
| * 30044c66bc drivers/nvme: Add quirks for device 126f:2262
| * 5245a6da27 io_uring: clear opcode specific data for an early failure
| * f8a7b7b085 fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
| * 8b849265da ASoC: soc-core.c: Skip dummy codec when adding platforms
| * 103c0f946f thermal/of: Assume polling-delay(-passive) 0 when absent
| * 409289d0a1 usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
| * 57e6634e59 usb: typec: tcpci: add generic tcpci fallback compatible
| * f692c547e3 thunderbolt: Keep the domain powered when USB4 port is in redrive mode
| * 893b256261 usb: gadget: uvc: mark incomplete frames with UVC_STREAM_ERR
| * 7dbf082988 bus: mhi: host: Add MHI_PM_SYS_ERR_FAIL state
| * 63eaa43d5d tools: iio: replace seekdir() in iio_generic_buffer
| * 1e9f5619d9 ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment
| * 5e7da5bb2d ktest: force $buildonly = 1 for 'make_warnings_file' test type
| * 39da708cb2 perf/x86/amd/lbr: Discard erroneous branch entries
| * 44479c7fef platform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet
| * 70310e55b5 Input: allocate keycode for Display refresh rate toggle
| * 055e406d7b Input: imagis - use FIELD_GET where applicable
| * 4097b1f10f RDMA/cm: add timeout to cm_destroy_id wait
| * 512a01da71 block: prevent division by zero in blk_rq_stat_sum()
| * c87e811cae input/touchscreen: imagis: Correct the maximum touch area value
| * b7d153bfba libperf evlist: Avoid out-of-bounds access
| * aaefa79c15 Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
| * 43be051f35 SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
| * 3a94feab04 drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()
| * 354a5d7bb7 drm/amd/display: Fix nanosec stat overflow
| * aba664845a ext4: forbid commit inconsistent quota data when errors=remount-ro
| * baba351068 ext4: add a hint for block bitmap corrupt state in mb_groups
| * b75395ec4b ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter
| * 84ed33a082 media: sta2x11: fix irq handler cast
| * 2e2177f94c Julia Lawall reported this null pointer dereference, this should fix it.
| * 3f3c1e735d rcu-tasks: Repair RCU Tasks Trace quiescence check
| * eae948ecd5 ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops
| * 13701b0f01 isofs: handle CDs with bad root inode but good Joliet root directory
| * ee0b5f96b6 scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
| * 53cb1e52c9 sysv: don't call sb_bread() with pointers_lock held
| * 5238e1c2bd pinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs
| * c87dd15918 drm: panel-orientation-quirks: Add quirk for GPD Win Mini
| * ac1e0f080a Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
| * 48bfb4b03c drm/vc4: don't check if plane->state->fb == state->fb
| * a83a7728e4 Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922
| * b19fe5eea6 Bluetooth: btintel: Fix null ptr deref in btintel_read_version
| * d7ee3bf0ca net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
| * 5693dd6d3d ice: use relative VSI index for VFs instead of PF VSI number
| * 9ae356c627 btrfs: send: handle path ref underflow in header iterate_inode_ref()
| * 0f30f95b91 btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
| * 36c2a2863b btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
| * 50bd749c60 cpufreq: Don't unregister cpufreq cooling on CPU hotplug
| * 6597a6687a wifi: ath11k: decrease MHI channel buffer length to 8KB
| * 4e0cfb25d4 dma-direct: Leak pages on dma_set_decrypted() failure
| * a3f6045ce3 net: pcs: xpcs: Return EINVAL in the internal methods
| * 51a9b20a04 tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
| * 635594cca5 pstore/zone: Add a null pointer check to the psz_kmsg_read
| * 8ead0a04a7 wifi: brcmfmac: Add DMI nvram filename quirk for ACEPC W5 Pro
| * 161d6b8037 firmware: tegra: bpmp: Return directly after a failed kzalloc() in get_filename()
| * 8af60bb2b2 net: skbuff: add overflow debug check to pull/push helpers
| * b8ca15861c ionic: set adminq irq affinity
| * 6925d11fbd arm64: dts: rockchip: fix rk3399 hdmi ports node
| * a292048934 arm64: dts: rockchip: fix rk3328 hdmi ports node
| * b510fbe3a7 cpuidle: Avoid potential overflow in integer multiplication
| * 94b016b28b panic: Flush kernel log buffer at the end
| * 8d80e09202 wifi: iwlwifi: pcie: Add the PCI device id for new hardware
| * feacd430b4 VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
| * fd5fdacae9 wifi: rtw89: pci: enlarge RX DMA buffer to consider size of RX descriptor
| * d6b0472d5f bnx2x: Fix firmware version string character counts
| * 7dd4831c3e wifi: ath9k: fix LNA selection in ath_ant_try_scan()
| * e6768c6737 amdkfd: use calloc instead of kzalloc to avoid integer overflow
* | a28d27f66e ANDROID: fix crc issue in net/ipv4/inet_fragment.c
* | da08c217d8 ANDROID: preserve CRC values in struct sk_buff due to ip_defrag_offset removal
* | 416b90bf47 Revert "vsock/virtio: fix packet delivery to tap device"
* | 66a1080110 Merge 6.1.85 into android14-6.1-lts
|\|
| * bf1e3b1cb1 Linux 6.1.85
| * e21838dfd0 x86: set SPECTRE_BHI_ON as default
| * 3e4283b771 KVM: x86: Add BHI_NO
| * 43704e993a x86/bhi: Mitigate KVM by default
| * bb8384b6df x86/bhi: Add BHI mitigation knob
| * 42196bdec0 x86/bhi: Enumerate Branch History Injection (BHI) bug
| * 29c50bb6fb x86/bhi: Define SPEC_CTRL_BHI_DIS_S
| * 07dbb10f15 x86/bhi: Add support for clearing branch history at syscall entry
| * 74fcb18177 x86/syscall: Don't force use of indirect calls for system calls
| * fd52c0397b x86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file
| * 5e6898b854 nvme: fix miss command type check
| * 9c2b4b6577 mm/secretmem: fix GUP-fast succeeding on secretmem folios
| * a6dc534c07 selftests: mptcp: display simult in extra_msg
| * d1fefedc1a mptcp: don't account accept() of non-MPC client as fallback to TCP
| * 08ef93ebc7 selftests: mptcp: join: fix dev in check_endpoint
| * 7e8360ac87 smb: client: fix potential UAF in cifs_signal_cifsd_for_reconnect()
| * f941400479 smb: client: fix potential UAF in smb2_is_network_name_deleted()
| * 494c91e1e9 smb: client: fix potential UAF in is_valid_oplock_break()
| * c868cabdf6 smb: client: fix potential UAF in smb2_is_valid_lease_break()
| * 84488466b7 smb: client: fix potential UAF in smb2_is_valid_oplock_break()
| * 16b7d78577 smb: client: fix potential UAF in cifs_stats_proc_show()
| * 8fefd166fc smb: client: fix potential UAF in cifs_stats_proc_write()
| * 2290423146 smb: client: fix potential UAF in cifs_debug_files_proc_show()
| * 8c99dfb49b smb3: retrying on failed server close
| * f6583444d7 riscv: process: Fix kernel gp leakage
| * c88f7a7095 riscv: Fix spurious errors from __get/put_kernel_nofault
| * 447d844a3e s390/entry: align system call table on 8 bytes
| * 22943e4fe4 x86/coco: Require seeding RNG with RDRAND on CoCo systems
| * 20a915154c x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
| * 97e93367e8 x86/mm/pat: fix VM_PAT handling in COW mappings
| * 7b6df050c4 of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
| * 9406d598a1 driver core: Introduce device_link_wait_removal()
| * f35d7ede62 ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
| * 2ff8f06550 ALSA: hda/realtek - Fix inactive headset mic jack
| * 883e072e83 ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
| * 51a6c2af9d ksmbd: validate payload size in ipc response
| * 2e5f8dc1de ksmbd: don't send oplock break if rename fails
| * 7ef6a7f9b3 x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk
| * c19715ec25 nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
| * 12059cf048 ata: sata_mv: Fix PCI device ID table declaration compilation warning
| * 78942ac754 cifs: Fix caching to try to do open O_WRONLY as rdwr on server
| * 9adcfd5670 scsi: sd: Unregister device if device_add_disk() failed in sd_probe()
| * 4b87c1bc25 scsi: mylex: Fix sysfs buffer lengths
| * 7171d6aef1 ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
| * 7ff957cea8 ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
| * 4ff3d8ac62 ASoC: rt711-sdw: fix locking sequence
| * 044c34fe35 ASoC: rt711-sdca: fix locking sequence
| * eb028d1ebd ASoC: rt5682-sdw: fix locking sequence
| * 392c47fea7 drm/panfrost: fix power transition timeout warnings
| * 81f7c9da2b drivers/perf: riscv: Disable PERF_SAMPLE_BRANCH_* while not supported
| * d00c24ddec 9p: Fix read/write debug statements to report server reply
| * 90a477dfda fs/pipe: Fix lockdep false-positive in watchqueue pipe_write()
| * 4af6d5b4d9 KVM: SVM: Add support for allowing zero SEV ASIDs
| * 2233bd583c KVM: SVM: Use unsigned integers when dealing with ASIDs
| * 815c2a1c43 KVM: SVM: WARN, but continue, if misc_cg_set_capacity() fails
| * 2f7efda53a KVM: SVM: enhance info printk's in SEV init
| * f089d4554a net: ravb: Always update error counters
| * f9690dfa18 net: ravb: Always process TX descriptor ring
| * 265a0fc55f net: ravb: Let IP-specific receive function to interrogate descriptors
| * b3608fe28f net: fec: Set mac_managed_pm during probe
| * c178122207 drivers: net: convert to boolean for the mac_managed_pm flag
| * 4eed9d0a48 tcp: Fix bind() regression for v6-only wildcard and v4(-mapped-v6) non-wildcard addresses.
| * 77db987b47 r8169: prepare rtl_hw_aspm_clkreq_enable for usage in atomic context
| * 9109472e71 r8169: use spinlock to protect access to registers Config2 and Config5
| * a33b7cb184 r8169: use spinlock to protect mac ocp register access
| * 095cfa2d9b i40e: Enforce software interrupt during busy-poll exit
| * 2f6953617d i40e: Remove _t suffix from enum type names
| * f3c2ceb847 i40e: Store the irq number in i40e_q_vector
| * 810dd068ae drm/amd: Flush GFXOFF requests in prepare stage
| * 43df8e64df drm/amd: Add concept of running prepare_suspend() sequence for IP blocks
| * 2990d8eacd drm/amd: Evict resources during PM ops prepare() callback
| * 3e89846283 i40e: fix vf may be used uninitialized in this function warning
| * fe74ea5b8b i40e: fix i40e_count_filters() to count only active/new filters
| * d417e3c16d octeontx2-af: Add array index check
| * e7e7030f0a octeontx2-pf: check negative error code in otx2_open()
| * 39efe5b6f6 octeontx2-af: Fix issue with loading coalesced KPU profiles
| * 940ff35ae8 udp: prevent local UDP tunnel packets from being GROed
| * 8c58d38405 udp: do not transition UDP GRO fraglist partial checksums to unnecessary
| * d12245080c udp: do not accept non-tunnel GSO skbs landing in a tunnel
| * fd6692e9b5 r8169: skip DASH fw status checks when DASH is disabled
| * 80247e0eca mlxbf_gige: stop interface during shutdown
| * 167d4b47a9 ipv6: Fix infinite recursion in fib6_dump_done().
| * 2febb7eeb4 selftests: reuseaddr_conflict: add missing new line at the end of the output
| * 1db7fcb2b2 erspan: make sure erspan_base_hdr is present in skb->head
| * 1829b618cc i40e: Fix VF MAC filter removal
| * ed37bdaee6 x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO
| * 23178ec5ab x86/bugs: Fix the SRSO mitigation on Zen3/4
| * 2eeab8c47c gro: fix ownership transfer
| * 66cb665900 selftests: net: gro fwd: update vxlan GRO test expectations
| * 1060816169 net: phy: micrel: Fix potential null pointer dereference
| * 77f5e52d7b net: phy: micrel: lan8814: Fix when enabling/disabling 1-step timestamping
| * e01835f3a1 net: stmmac: fix rx queue priority assignment
| * b7d1ce2cc7 net/sched: fix lockdep splat in qdisc_tree_reduce_backlog()
| * 55d3fe7b2b net/sched: act_skbmod: prevent kernel-infoleak
| * a44770fed8 bpf, sockmap: Prevent lock inversion deadlock in map delete elem
| * 8a57544e92 vboxsf: Avoid an spurious warning if load_nls_xxx() fails
| * 18aae2cb87 netfilter: validate user input for expected length
| * 9b5b7708ec netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
| * 4e8447a9a3 netfilter: nf_tables: flush pending destroy work before exit_net release
| * 745cf6a843 netfilter: nf_tables: reject new basechain after table flag update
| * 1c9e71ca61 Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
| * db388b8e12 vsock/virtio: fix packet delivery to tap device
| * fc77240f63 net: usb: ax88179_178a: avoid the interface always configured as random address
| * cbaac2e548 net/rds: fix possible cp null dereference
| * 7c1250796b xen-netfront: Add missing skb_mark_for_recycle
| * 18e189442a Bluetooth: Fix TOCTOU in HCI debugfs implementation
| * 38e3eaa861 Bluetooth: hci_event: set the conn encrypted before conn establishes
| * 3e773d04ae Bluetooth: add quirk for broken address properties
| * a2812ff7ea Bluetooth: qca: fix device-address endianness
| * 298dc5dd38 arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken
| * 9bf4acc802 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT"
| * 5d920886c3 x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
| * 3d61f1704b r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
| * 923579201d KVM: arm64: Fix host-programmed guest events in nVHE
| * ad141b08d1 perf/x86/amd/lbr: Use freeze based on availability
| * 8d029111b8 x86/cpufeatures: Add new word for scattered features
| * 58638e3b48 dm integrity: fix out-of-range warning
| * 7d0567842b inet: inet_defrag: prevent sk release while still in use
| * 0642673765 Octeontx2-af: fix pause frame configuration in GMP mode
| * 2553bfaa19 net: lan743x: Add set RFE read fifo threshold for PCI1x1x chips
| * 852698c9fd cifs: Fix duplicate fscache cookie warnings
| * 98cdac206b bpf: Protect against int overflow for stack access size
| * 24444af5dd mlxbf_gige: call request_irq() after NAPI initialized
| * 30fabe50a7 tls: get psock ref after taking rxlock to avoid leak
| * f52c8f1210 tls: adjust recv return with async crypto and failed copy to userspace
| * efb4573fea tls: recv: process_rx_list shouldn't use an offset with kvec
| * 0e111ce740 net: hns3: mark unexcuted loopback test result as UNEXECUTED
| * 50b69054f4 net: hns3: fix kernel crash when devlink reload during pf initialization
| * b8b533eeee net: hns3: fix index limit to support all queue stats
| * ebabdae52f ACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields()
| * beaf0e7996 net: wwan: t7xx: Split 64bit accesses to fix alignment issues
| * 91b243de91 tcp: properly terminate timers for kernel sockets
| * 16307e7bc1 s390/qeth: handle deferred cc1
| * 231b189fa1 ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
| * 99a75d7500 wifi: iwlwifi: mvm: rfi: fix potential response leaks
| * 57beec623a mlxbf_gige: stop PHY during open() error paths
| * b51ec7fc9f nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
| * 0336995512 dma-buf: Fix NULL pointer dereference in sanitycheck()
| * 8333aae9bb scripts/bpf_doc: Use silent mode when exec make cmd
* 7b7c6df465 Merge branch 'android14-6.1' into branch 'android14-6.1-lts'
* 0cf5cecba6 Revert "crypto: api - Disallow identical driver names"

Change-Id: Iace3d6c28e979288bd5e452ec7513ce23ee300d6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2024-07-20 13:53:50 +00:00
2023-02-09 13:29:55 +00:00
2024-06-21 08:37:53 +00:00
2024-06-21 08:37:53 +00:00
2024-06-21 08:32:20 +00:00
2022-09-28 09:02:20 +02:00
2024-06-21 08:37:53 +00:00
2023-06-15 09:54:33 +01:00

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.
  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass scripts/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)
Description
No description provided
Readme 7.9 GiB
Languages
C 97.7%
Assembly 1.6%
Makefile 0.3%
Perl 0.1%