mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
9e207186c74578f0ef1872467740ab30f74abe6d
This merges the android14-6.1.138_r00 tag into the android14-6.1 branch, catching it up with the latest LTS releases. It contains the following commits: *4894546596Revert "cpufreq: Avoid using inconsistent policy->min and policy->max" *9840922a87Revert "cpufreq: Fix setting policy limits when frequency tables are used" *1e50e672f2UPSTREAM: arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists *4c7f06c5daMerge 6.1.138 into android14-6.1-lts |\ | *02b72ccb5fLinux 6.1.138 | *5626b47a3eASoC: soc-core: Stop using of_property_read_bool() for non-boolean properties | *79ff5e2629ASoC: Use of_property_read_bool() | *e25139c4aadrm/amd/display: Fix slab-use-after-free in hdcp | *942ecb9e8fdrm/amd/display: Add scoped mutexes for amdgpu_dm_dhcp | *e07ed98515drm/amd/display: Change HDCP update sequence for DM | *e56b7400e9drm/amd/display: Clean up style problems in amdgpu_dm_hdcp.c | *8a86bb891bdrm/amd/display: phase2 enable mst hdcp multiple displays | *8316820e40iommu/arm-smmu-v3: Fix iommu_device_probe bug due to duplicated stream ids | *28ddd9cf9diommu/arm-smmu-v3: Use the new rb tree helpers | *4c4f168b46dm: fix copying after src array boundaries | *dc0d654eb4irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode() | *c8f809b3deirqchip/gic-v2m: Mark a few functions __init | *36d4ce271bRevert "drm/meson: vclk: fix calculation of 59.94 fractional rates" | *9b89102fbbnet: phy: microchip: force IRQ polling mode for lan88xx | *72a797facbARM: dts: opos6ul: add ksz8081 phy properties | *88d7fd2d46firmware: arm_ffa: Skip Rx buffer ownership release if not acquired | *ff4273d47dfirmware: arm_scmi: Balance device refcount when destroying devices | *c13b801e85Revert "x86/kexec: Allocate PGD for x86_64 transition page tables separately" | *be9e230281sch_ets: make est_qlen_notify() idempotent | *83fb922d06sch_qfq: make qfq_qlen_notify() idempotent | *0475c85426sch_hfsc: make hfsc_qlen_notify() idempotent | *0e59ce6cf3sch_drr: make drr_qlen_notify() idempotent | *73cf6af131sch_htb: make htb_qlen_notify() idempotent | *85bb073b89PCI: imx6: Skip controller_id generation logic for i.MX7D | *8dcd498116md: move initialization and destruction of 'io_acct_set' to md.c | *01b8322147net: vertexcom: mse102x: Fix RX error handling | *7bdc90cf92net: vertexcom: mse102x: Add range check for CMD_RTS | *9e951979efnet: vertexcom: mse102x: Fix LEN_MASK | *53b6b3614dnet: vertexcom: mse102x: Fix possible stuck of SPI interrupt | *2735065ac6net: hns3: defer calling ptp_clock_register() | *de5ad4dbecnet: hns3: fixed debugfs tm_qset size | *9137a78d0bnet: hns3: fix an interrupt residual problem | *e15d00593dnet: hns3: store rx VLAN tag offload state for VF | *328e124da6net: fec: ERR007885 Workaround for conventional TX | *a0e0efbabbnet: lan743x: Fix memleak issue when GSO enabled | *44c3f30c8envme-tcp: fix premature queue removal and I/O failover | *2922716d94bnxt_en: Fix ethtool -d byte order for 32-bit values | *43292b8342bnxt_en: Fix out-of-bound memcpy() during ethtool -w | *b1c2b19dccbnxt_en: Fix coredump logic to free allocated buffer | *68bfb59b3cnet: ipv6: fix UDPv6 GSO segmentation with NAT | *f57fd07d7cnet: dsa: felix: fix broken taprio gate states after clock jump | *9f9c9d1c08net: dlink: Correct endianness handling of led_mode | *0561f2e374ice: Check VF VSI Pointer Value in ice_vc_add_fdir_fltr() | *0aa23e0856net_sched: qfq: Fix double list add in class with netem as child qdisc | *9efb6a0fa8net_sched: ets: Fix double list add in class with netem as child qdisc | *8df7d37d62net_sched: hfsc: Fix a UAF vulnerability in class with netem as child qdisc | *4f0ecf50cdnet_sched: drr: Fix double list add in class with netem as child qdisc | *eaf2494138net: ethernet: mtk-star-emac: rearm interrupts in rx_poll only when advised | *94107259f9net: ethernet: mtk-star-emac: fix spinlock recursion issues on rx/tx poll | *4195bd195anet: mscc: ocelot: delete PVID VLAN when readding it as non-PVID | *2ab2780146net: mscc: ocelot: treat 802.1ad tagged traffic as 802.1Q-untagged | *901346b673net/mlx5: E-switch, Fix error handling for enabling roce | *455a5261c9net/mlx5: E-Switch, Initialize MAC Address for Default GID | *2d4a121296vxlan: vnifilter: Fix unlocked deletion of default FDB entry | *93d646911bwifi: plfxlc: Remove erroneous assert in plfxlc_mac_release | *92b0c8414cASoC: soc-pcm: Fix hw_params() and DAPM widget sequence | *a99f5bf4f7dm-bufio: don't schedule in atomic context | *93eeb6df16KVM: x86: Load DR6 with guest value only before entering .vcpu_run() loop | *227bda0fd0xfs: restrict when we try to align cow fork delalloc to cowextsz hints | *6724a3faa8xfs: allow unlinked symlinks and dirs with zero size | *df403c882fxfs: fix freeing speculative preallocations for preallocated files | *9e1ad0875exfs: make sure sb_fdblocks is non-negative | *80d3d1e7a2xfs: allow symlinks with short remote targets | *251af3b8c1xfs: convert delayed extents to unwritten when zeroing post eof blocks | *9ae4afcb9fxfs: make xfs_bmapi_convert_delalloc() to allocate the target offset | *b4dbf90564xfs: make the seq argument to xfs_bmapi_convert_delalloc() optional | *0e2fcf273bxfs: match lock mode in xfs_buffered_write_iomap_begin() | *7bfa86d204xfs: revert commit44af6c7e59| *b359d2ee93xfs: validate recovered name buffers when recovering xattr items | *d6f7f0ddc4xfs: check opcode and iovec count match in xlog_recover_attri_commit_pass2 | *3a97d267fdxfs: require XFS_SB_FEAT_INCOMPAT_LOG_XATTRS for attr log intent item recovery | *2edfd2c87cxfs: remove a racy if_bytes check in xfs_reflink_end_cow_extent | *1e2a60807fxfs: fix xfs_bmap_add_extent_delay_real for partial conversions | *ddbfb6adb0xfs: fix error returns from xfs_bmapi_write | *441021e5b3tracing: Fix oob write in trace_seq_to_buffer() | *15888cd413cpufreq: Fix setting policy limits when frequency tables are used | *681400579bcpufreq: Avoid using inconsistent policy->min and policy->max | *e34a33d5d7ksmbd: fix use-after-free in kerberos authentication | *cf443f3145platform/x86/intel-uncore-freq: Fix missing uncore sysfs during CPU hotplug | *810947bfbbiommu/vt-d: Apply quirk_iommu_igfx for 8086:0044 (QM57/QS57) | *c3f37faa71iommu/amd: Fix potential buffer overflow in parse_ivrs_acpihid | *2dd9448441dm: always update the array size in realloc_argv on success | *12351db6c3dm-integrity: fix a warning on invalid table line | *524b70441bwifi: brcm80211: fmac: Add error handling for brcmf_usb_dl_writeimage() | *3eaa5e3630mmc: renesas_sdhi: Fix error handling in renesas_sdhi_probe | *45aced97f0irqchip/qcom-mpm: Prevent crash when trying to handle non-wake GPIOs | *bdabd4ee04amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload | *160153cf9eperf/x86/intel: KVM: Mask PEBS_ENABLE loaded for guest with vCPU's value. | *6c639af49eparisc: Fix double SIGFPE crash | *446289b8b3arm64: errata: Add missing sentinels to Spectre-BHB MIDR arrays | *b36749bb27i2c: imx-lpi2c: Fix clock count when probe defers | *a62780b542EDAC/altera: Set DDR and SDMMC interrupt mask before registration | *1705059287EDAC/altera: Test the correct error reg offset | *47ca11836cdrm/nouveau: Fix WARN_ON in nouveau_fence_context_kill() | *6649a1dbcdALSA: usb-audio: Add second USB ID for Jabra Evolve 65 headset | *3cdbf62209Revert "rndis_host: Flag RNDIS modems as WWAN devices" * |a70a8dc18fMerge 6.1.137 into android14-6.1-lts |\| | *ac7079a42eLinux 6.1.137 | *8b4c07bb51LoongArch: Fix build error due to backport * |3b32124339ANDROID: GKI: Add bpf_redirect_info to virtual_device symbol list. * |6751b87143ANDROID: GKI: fix up crc issue in crypto_get_default_null_skcipher() * |0b32b5b8c1Revert "module: sign with sha512 instead of sha1 by default" * |e63ea17387Merge 6.1.136 into android14-6.1-lts |\| | *b6736e0375Linux 6.1.136 | *715b345153objtool: Silence more KCOV warnings, part 2 | *cfe7fd06a1ASoC: qcom: q6afe-dai: fix Display Port Playback stream name | *fbf45385e3PCI: Fix use-after-free in pci_bus_release_domain_nr() | *353e182012tracing: Remove pointer (asterisk) and brackets from cpumask_t field | *c8cbb6179cphy: freescale: imx8m-pcie: Add one missing error return | *fc053d2df4phy: freescale: imx8m-pcie: Do CMN_RST just before PHY PLL lock check | *1a9e5875c5nvme: fixup scan failure for non-ANA multipath controllers | *48600cbc4bMIPS: cm: Fix warning if MIPS_CM is disabled | *ae43d74d45xdp: Reset bpf_redirect_info before running a xdp's BPF prog. | *3aaca46e8fnet: dsa: mv88e6xxx: enable STU methods for 6320 family | *503d67b31cnet: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family | *9ff467ae32net: dsa: mv88e6xxx: enable PVT for 6321 switch | *dc6b55cfe7net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family | *e873e8f7d0net/sched: act_mirred: don't override retval if we already lost the skb | *4f9f61598bcrypto: atmel-sha204a - Set hwrng quality to lowest possible | *3a57f45b91comedi: jr3_pci: Fix synchronous deletion of timer | *63d956acbfjfs: define xtree root and page independently | *5d59fd637aof: module: add buffer overflow check in of_modalias() | *2fea0d6d7bspi: spi-imx: Add check for spi_imx_setupxfer() | *fc9629651bmd/raid1: Add check for missing source disk in process_checks() | *61b36bdc70ubsan: Fix panic from test_ubsan_out_of_bounds | *af1c735e21spi: tegra210-quad: add rate limiting and simplify timeout error message | *009847bd69spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts | *342a5dfc21loop: aio inherit the ioprio of original request | *ddc9ef51bcx86/i8253: Call clockevent_i8253_disable() with interrupts disabled | *30e482dfb8scsi: pm80xx: Set phy_attached to zero when device is gone | *dae1e15fccscsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init() | *9e3014d786scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes | *39ebdc2d51ext4: make block validity check resistent to sb bh corruption | *0c2aea3235nvmet-fc: put ref when assoc->del_work is already scheduled | *b7f235cb88nvmet-fc: take tgtport reference only once | *2184c42971x86/bugs: Don't fill RSB on context switch with eIBRS | *3b2efa5695x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline | *14b1cbf034x86/bugs: Use SBPB in write_ibpb() if applicable | *6c94a16ba2selftests/mincore: Allow read-ahead pages to reach the end of the file | *4aebc6708cobjtool: Stop UNRET validation on UD2 | *498027367fnvme: re-read ANA log page after ns scan completes | *510ba30dd3ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls | *d4444abc19ACPI: EC: Set ec_no_wakeup for Lenovo Go S | *2fbd0e1930nvme: requeue namespace scan on missed AENs | *e9f8bfb80exen: Change xen-acpi-processor dom0 dependency | *9ce224eb5aselftests: ublk: fix test_stripe_04 | *3f6c9d66e0udmabuf: fix a buf size overflow issue during udmabuf creation | *b16d315a18KVM: s390: Don't use %pK through tracepoints | *dcd21345ebsched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP | *b22fac54c5rtc: pcf85063: do a SW reset if POR failed | *468ff4a7c69p/net: fix improper handling of bogus negative read/write replies | *43b498a845ntb_hw_amd: Add NTB PCI ID for new gen CPU | *763bf67ed3ntb: reduce stack usage in idt_scan_mws | *545defa656qibfs: fix _another_ leak | *f93a840d4bobjtool, lkdtm: Obfuscate the do_nothing() pointer | *4e57e330fbobjtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler() | *5f9385723aobjtool: Silence more KCOV warnings | *bc49c5103ethunderbolt: Scan retimers after device router has been enumerated | *7e8f1dbf9busb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func | *36d6815171usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() | *9e7bcd1e2busb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running | *d9a60dd67bdmaengine: dmatest: Fix dmatest waiting less when interrupted | *54c7b864fbsound/virtio: Fix cancel_sync warnings on uninitialized work_structs | *c2902e8abcusb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield | *a7a27cf25busb: dwc3: gadget: Refactor loop to avoid NULL endpoints | *609c9ea787fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size | *27b12b5878usb: host: max3421-hcd: Add missing spi_device_id table | *57089df327s390/tty: Fix a potential memory leak bug | *397254706es390/sclp: Add check for get_zeroed_page() | *d0db2eb990parisc: PDT: Fix missing prototype warning | *2236d765a3clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() | *255cbc9db7bpf: Fix deadlock between rcu_tasks_trace and event_mutex. | *e27244cbe1crypto: null - Use spin lock instead of mutex | *aba9e3096bMIPS: cm: Detect CM quirks from device tree | *ba9bf51801pinctrl: renesas: rza2: Fix potential NULL pointer dereference | *64ebb33768USB: wdm: add annotation | *e0917befd1USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context | *217fe1fc7dUSB: wdm: close race between wdm_open and wdm_wwan_port_stop | *15a7f14737USB: wdm: handle IO errors in wdm_wwan_port_start | *6b607ae3f4USB: VLI disk crashes if LPM is used | *219716ce07usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive | *a408b8043ausb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive | *07b491b601usb: dwc3: xilinx: Prevent spike in reset signal | *a445470152usb: dwc3: gadget: check that event count does not exceed event buffer length | *8b4b7ad42aUSB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02) | *df727eba55usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling | *d2daafc3f0usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines | *0ee460498cusb: chipidea: ci_hdrc_imx: fix usbmisc handling | *c27db84ed4usb: cdns3: Fix deadlock when using NCM gadget | *0a8f200a1aUSB: serial: simple: add OWON HDS200 series oscilloscope support | *a5d0eaa074USB: serial: option: add Sierra Wireless EM9291 | *acb866379eUSB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe | *fd93c803f2serial: sifive: lock port in startup()/shutdown() callbacks | *1adf7a1165serial: msm: Configure correct working mode before starting earlycon | *4d43b7091emisc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack | *1263d5f581misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration | *023816bd5fKVM: x86: Reset IRTE to host control if *new* route isn't postable | *38cfa866b7KVM: x86: Explicitly treat routing entry type changes as changes | *05a5c6b0e8mei: me: add panther lake H DID | *90757407caUSB: storage: quirk for ADATA Portable HDD CH94 | *c5b8a549efmcb: fix a double free bug in chameleon_parse_gdd() | *f46d889308KVM: SVM: Allocate IR data using atomic allocation | *5d4636859aLoongArch: Remove a bogus reference to ZONE_DMA | *3425680572LoongArch: Return NULL from huge_pte_offset() for invalid PMD | *128d261c72drm/amd/display: Force full update in gpu reset | *a4be735fe0drm/amd/display: Fix gpu reset in multidisplay config | *24023ed8ffnet: selftests: initialize TCP header and skb payload with zero | *5b83d30c63xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() | *baa332e22fvirtio_console: fix missing byte order handling for cols and rows | *4e8ce3978dwifi: rtw88: use ieee80211_purge_tx_queue() to purge TX skb | *ff5a5dae30wifi: mac80211: export ieee80211_purge_tx_queue() for drivers | *4e773aea05LoongArch: Make regs_irqs_disabled() more clear | *da3170fea4LoongArch: Select ARCH_USE_MEMTEST | *ecb3f8f890perf/x86: Fix non-sampling (counting) events on certain x86 platforms | *9e75c93472iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE | *11bccb054cnet_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too | *20d584a33enet_sched: hfsc: Fix a UAF vulnerability in class handling | *e79e8e05aatipc: fix NULL pointer dereference in tipc_mon_reinit_self() | *f41f097f68net: phy: leds: fix memory leak | *ceceff6d31net: lwtunnel: disable BHs when required | *790bad9dc2scsi: core: Clear flags for scsi_cmnd that did not complete | *fd18210acbbtrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range() | *a252684ea1cpufreq: cppc: Fix invalid return value in .get() callback | *da8ee91e53cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() | *f9c5423855cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() | *4bf6d7defbdma/contiguous: avoid warning about unused size_bytes | *19cc82616bselftests/mm: generate a temporary mountpoint for cgroup filesystem | *d78888853eASoC: qcom: Fix sc7280 lpass potential buffer overflow | *20ecb510d4ASoC: qcom: q6dsp: add support to more display ports | *11f56f5a25phy: freescale: imx8m-pcie: assert phy reset and perst in power off | *cf0fbe3e9bphy: freescale: imx8m-pcie: Add i.MX8MP PCIe PHY support | *b783478e0cPCI: Fix reference leak in pci_register_host_bridge() | *ead4d69b3ePCI: Assign PCI domain IDs by ida_alloc() | *9c32eaf8e4of: resolver: Fix device node refcount leakage in of_resolve_phandles() | *fc7e57c56dof: resolver: Simplify of_resolve_phandles() using __free() | *b7f5964d03clk: renesas: r9a07g043: Fix HP clock source for RZ/Five | *5053ee6f8dclk: renesas: r9a07g04[34]: Fix typo for sel_shdi variable | *8213d3a61fclk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux | *50563380f7clk: renesas: rzg2l: Refactor SD mux driver | *94c31387f6clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header | *0b78075a9cclk: renesas: rzg2l: Add struct clk_hw_data | *a70a0ac48bclk: renesas: rzg2l: Use u32 for flag and mux_flags | *b447885ec9backlight: led_bl: Hold led_access lock when calling led_sysfs_disable() | *c5a9d6c54dbacklight: led_bl: Convert to platform remove callback returning void | *11f724853eiio: adc: ad7768-1: Fix conversion result sign | *c13b7cacbciio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check | *c239afce68net: dsa: mv88e6xxx: fix VTU methods for 6320 family | *58c14a5e2anet: dsa: mv88e6xxx: fix internal PHYs for 6320 family | *4db3e956canet: dsa: mv88e6xxx: add field to specify internal phys layout | *7cdba14d75net: dsa: mv88e6xxx: pass directly chip structure to mv88e6xxx_phy_is_internal | *3edbf0fd90net: dsa: mv88e6xxx: move link forcing to mac_prepare/mac_finish | *f27b1e1fd3net: dsa: add support for mac_prepare() and mac_finish() calls | *9369d414eenet: dsa: mv88e6xxx: don't dispose of Global2 IRQ mappings from mdiobus code | *0882b47507auxdisplay: hd44780: Fix an API misuse in hd44780.c | *4b9c5e6e89auxdisplay: hd44780: Convert to platform remove callback returning void | *6854c87ac8tracing: Verify event formats that have "%*p.." | *480b9fc4b2tracing: Add __print_dynamic_array() helper | *247feaa174tracing: Add __string_len() example | *41abc05ab8tracing: Fix cpumask() example typo | *3c8a30f95btracing: Add __cpumask to denote a trace event field that is a cpumask_t | *7c2f874c63module: sign with sha512 instead of sha1 by default * |ae9d2e99d9Merge 6.1.135 into android14-6.1-lts |\| | *535ec20c50Linux 6.1.135 | *ed4125569bALSA: hda/realtek: Fix built-in mic on another ASUS VivoBook model | *ca9f84de76md: fix mddev uaf while iterating all_mddevs list | *bf1dc50bd5md: factor out a helper from mddev_put() | *92f0f21b9aMIPS: ds1287: Match ds1287_set_base_clock() function types | *d268e58918MIPS: cevt-ds1287: Add missing ds1287.h include | *0dde1e38fbMIPS: dec: Declare which_prom() as static * |fcf8d4d8b3Mergef331105699("sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3") into android14-6.1-lts |\| | *f331105699sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3 | *6e3319a2e0sign-file,extract-cert: avoid using deprecated ERR_get_error_line() | *3437e90d15sign-file,extract-cert: move common SSL helper functions to a header * |816b54a70dRevert "blk-cgroup: support to track if policy is online" * |44fe4b43e9Revert "blk-iocost: do not WARN if iocg was already offlined" * |ac80043d0fRevert "bpf: Prevent tail call between progs attached to different hooks" * |92d048684aMerge16c54d6a49("mm: fix apply_to_existing_page_range()") into android14-6.1-lts |\| | *16c54d6a49mm: fix apply_to_existing_page_range() | *aed0aac18fblk-iocost: do not WARN if iocg was already offlined | *3154d64ff9blk-cgroup: support to track if policy is online | *d9a807fb7cbpf: Prevent tail call between progs attached to different hooks | *4759acbd44bpf: avoid holding freeze_mutex during mmap operation | *282d1aa225btrfs: fix the length of reserved qgroup to free | *7d8bb979f6cifs: use origin fullpath for automounts | *ec28c35029smb/server: fix potential null-ptr-deref of lease_ctx_info in smb2_open() | *f27602b638nvmet-fc: Remove unused functions | *e37eabef53Revert "LoongArch: BPF: Fix off-by-one error in build_prologue()" | *b66bc16f4clandlock: Add the errata interface | *13080d052cdrm/amd/display: Stop amdgpu_dm initialize when link nums greater than max_links | *615c8f70beRevert "Xen/swiotlb: mark xen_swiotlb_fixup() __init" | *eec34d7d14btrfs: zoned: fix zone finishing with missing devices | *4aecf1c211btrfs: zoned: fix zone activation with missing devices | *159f0f61b2btrfs: fix qgroup reserve leaks in cow_file_range | *2a07aea0acLoongArch: Eliminate superfluous get_numa_distances_cnt() | *b137af7953powerpc/rtas: Prevent Spectre v1 gadget construction in sys_rtas() | *32e3456454x86/pvh: Call C code via the kernel virtual mapping | *8dfff85d5dx86/split_lock: Fix the delayed detection logic | *edde34b792mm: Fix is_zero_page() usage in try_grab_page() | *13beac8e96misc: pci_endpoint_test: Fix 'irq_type' to convey the correct type | *53f4df92a8misc: pci_endpoint_test: Fix displaying 'irq_type' after 'request_irq' error | *9d5118b107misc: pci_endpoint_test: Avoid issue of interrupts remaining after request_irq error | *6cc2c355aamptcp: sockopt: fix getting freebind & transparent | *89e1132bbfmedia: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline | *b3c789419fkbuild: Add '-fno-builtin-wcslen' | *0bf87fafc1cpufreq: Reference count policy in cpufreq_update_limits() * |3ba386dd55Merge17c7f46efb("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android14-6.1-lts |\| | *17c7f46efbKVM: arm64: Eagerly switch ZCR_EL{1,2} | *bde20e154aKVM: arm64: Calculate cptr_el2 traps on activating traps | *0ff8c9a71eKVM: arm64: Mark some header functions as inline | *60d55eb282KVM: arm64: Refactor exit handlers | *6648fef8ffKVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN | *9f2386b273KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN | *a539ca5c23KVM: arm64: Remove host FPSIMD saving for non-protected KVM | *04c50cc23aKVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state | *2fb8365017arm64/fpsimd: Stop using TIF_SVE to manage register saving in KVM | *254fe3a162arm64/fpsimd: Have KVM explicitly say which FP registers to save | *312024dc1barm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE | *d5f7d3833bKVM: arm64: Discard any SVE state when entering KVM guests * |d46f37d6c7Mergedc7bdc1f2d("io_uring/net: fix accept multishot handling") into android14-6.1-lts |\| | *dc7bdc1f2dio_uring/net: fix accept multishot handling | *b8acdc413fdrm/i915/gvt: fix unterminated-string-initialization warning | *4e4bd92623drm/sti: remove duplicate object names | *12b038d521drm/nouveau: prime: fix ttm_bo_delayed_delete oops | *6785702f4adrm/amdgpu/dma_buf: fix page_link check | *ffd6888044drm/amd/pm/powerplay/hwmgr/vega20_thermal: Prevent division by zero | *8f7b5987e2drm/amd/pm/swsmu/smu13/smu_v13_0: Prevent division by zero | *5fc4fb54f6drm/amd/pm/powerplay/hwmgr/smu7_thermal: Prevent division by zero | *de6f8e0534drm/amd/pm/smu11: Prevent division by zero | *836a189fb4drm/amd/pm/powerplay: Prevent division by zero | *402964994edrm/amd/pm: Prevent division by zero | *c812997534drm/amd: Handle being compiled without SI or CIK support better | *db783adae1drm/msm/a6xx: Fix stale rpmh votes from GPU | *3ba56fc34fdrm/repaper: fix integer overflows in repeat functions | *59f3925c3fperf/x86/intel/uncore: Fix the scale of IIO free running counters on SPR | *96b2982f12perf/x86/intel/uncore: Fix the scale of IIO free running counters on ICX | *8a809a8bcbperf/x86/intel/uncore: Fix the scale of IIO free running counters on SNR | *311b205fa9perf/x86/intel: Allow to update user space GPRs from PEBS records | *51003b2c87RDMA/cma: Fix workqueue crash in cma_netevent_work_handler | *3ddca18534scsi: ufs: exynos: Ensure consistent phy reference counts | *e72c35de50scsi: megaraid_sas: Block zero-length ATA VPD inquiry | *599d1e2a6avirtiofs: add filesystem context source name check | *b4a9e164ddtracing: Fix filter string testing | *b04eaa8de3string: Add load_unaligned_zeropad() code path to sized_strscpy() | *220f0fd6acsmb3 client: fix open hardlink on deferred close file error | *0f5de9dee5riscv: Avoid fortify warning in syscall_get_arguments() | *44079e544cksmbd: fix the warning from __kernel_write_iter | *817fbb8957ksmbd: Prevent integer overflow in calculation of deadtime | *d5b554bc8dksmbd: Fix dangling pointer in krb_authenticate | *f95a2ec3ecmm: fix filemap_get_folios_contig returning batches of identical folios | *a6e7f6018dmm/gup: fix wrongly calculated returned value in fault_in_safe_writeable() | *5cdc985c41loop: LOOP_SET_FD: send uevents for partitions | *df5118fd61loop: properly send KOBJ_CHANGED uevent for disk device | *0fdafdaef7isofs: Prevent the use of too small fid | *3090cad5cci2c: cros-ec-tunnel: defer probe if parent EC is not present * |b918f051e3Revert "arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists" * |e106f14940Merge0296f97335("hfs/hfsplus: fix slab-out-of-bounds in hfs_bnode_read_key") into android14-6.1-lts |\| | *0296f97335hfs/hfsplus: fix slab-out-of-bounds in hfs_bnode_read_key | *e9b5d6e1bdcrypto: caam/qi - Fix drv_ctx refcount bug | *9734612bd8btrfs: correctly escape subvol in btrfs_show_options() | *ba903539ffnfsd: decrease sc_count directly if fail to queue dl_recall | *3a47d1e8efnfs: add missing selections of CONFIG_CRC32 | *5ed9e05f59nfs: move nfs_fhandle_hash to common include file | *943fe13970asus-laptop: Fix an uninitialized variable | *8ba70a72f5ASoC: codecs:lpass-wsa-macro: Fix logic of enabling vi channels | *96c93b30e1ASoC: codecs:lpass-wsa-macro: Fix vi feedback rate | *94515f5fc0Revert "PCI: Avoid reset when disabled via sysfs" | *b4df8b74bdwriteback: fix false warning in inode_to_wb() | *0819b7c062cpufreq/sched: Fix the usage of CPUFREQ_NEED_UPDATE_LIMITS | *6a088c7d50riscv: KGDB: Remove ".option norvc/.option rvc" for kgdb_compiled_break | *0047bf9bdariscv: KGDB: Do not inline arch_kgdb_breakpoint() | *b23e67fac7riscv: Properly export reserved regions in /proc/iomem | *a6cb881e21ptp: ocp: fix start time alignment in ptp_ocp_signal_set | *343246e469net: dsa: avoid refcount warnings when ds->ops->tag_8021q_vlan_del() fails | *35cde75c08net: dsa: mv88e6xxx: fix -ENOENT when deleting VLANs and MST is unsupported | *b3c70dfe51net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered | *f06b5b4225net: bridge: switchdev: do not notify new brentries as changed | *464f78d35fnet: b53: enable BPDU reception for management port | *fa2d770895cxgb4: fix memory leak in cxgb4_init_ethtool_filters() error path | *1489c195c8net: openvswitch: fix nested key length validation in the set() action | *b9764ebebbnet: mctp: Set SOCK_RCU_FREE | *d8a632fbc7test suite: use %zu to print size_t | *eac3413518igc: cleanup PTP module if probe fails | *81e25321c6igc: handle the IGC_PTP_ENABLED flag correctly | *cfeeec7c5eigc: move ktime snapshot into PTM retry loop | *0c03e4fbe1igc: fix PTM cycle trigger logic | *e4cab92acaRevert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" | *c6d527bbd3Bluetooth: l2cap: Check encryption key size on incoming connection | *d844181869Bluetooth: btrtl: Prevent potential NULL dereference | *d54bc626c8Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address | *6c588e9afbRDMA/core: Silence oversized kvmalloc() warning | *883ca52730RDMA/hns: Fix wrong maximum DMA segment size | *837af21fd3RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe() | *065f4b1cd4md/md-bitmap: fix stats collection for external bitmaps | *4a05f7ae33md/raid10: fix missing discard IO accounting | *3943754c69scsi: iscsi: Fix missing scsi_host_put() in error path | *8fd4b9551awifi: wl1251: fix memory leak in wl1251_tx_work | *5f6863dc40wifi: mac80211: Purge vif txq in ieee80211_do_stop() | *a167a2833dwifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue() | *5e7df74745wifi: at76c50x: fix use after free access in at76_disconnect | *1ac5eb4aa2scsi: hisi_sas: Enable force phy when SATA disk directly connected | *d58493832eHSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition | *80f14e9de6Bluetooth: hci_uart: Fix another race during initialization | *8a1b01b7f6x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions() | *6dd04ebe2bACPI: platform-profile: Fix CFI violation when accessing sysfs files | *a53b3599d9arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists * |4f3eb66089Merge47b445fc79("selftests: mptcp: close fd_in before returning in main_loop") into android14-6.1-lts |\| | *47b445fc79selftests: mptcp: close fd_in before returning in main_loop * |8d8b1f0393Merge696198f89a("pinctrl: qcom: Clear latched interrupt status when changing IRQ type") into android14-6.1-lts |\| | *696198f89apinctrl: qcom: Clear latched interrupt status when changing IRQ type | *eb602e8c4ePCI: Fix reference leak in pci_alloc_child_bus() | *210f00e9b5PCI: brcmstb: Fix missing of_node_put() in brcm_pcie_probe() | *c467dbd5f1of/irq: Fix device node refcount leakages in of_irq_init() | *338f7aa649of/irq: Fix device node refcount leakage in API irq_of_parse_and_map() | *78d928bd60of/irq: Fix device node refcount leakages in of_irq_count() | *b84b58ae4fof/irq: Fix device node refcount leakage in API of_irq_parse_raw() | *ceb4266a78of/irq: Fix device node refcount leakage in API of_irq_parse_one() | *fbb0967846ntb: use 64-bit arithmetic for the MSI doorbell mask | *0357c8406dKVM: x86: Acquire SRCU in KVM_GET_MP_STATE to protect guest memory accesses | *3d4aa02359gve: handle overflow when reporting TX consumed descriptors | *bcfb1e4eb0gpio: zynq: Fix wakeup source leaks on device unbind | *5b3cc7e03cgpio: tegra186: fix resource handling in ACPI probe path | *8dd7d72803ftrace: Add cond_resched() to ftrace_graph_set_hash() | *3e070367ffdm-verity: fix prefetch-vs-suspend race | *5162ecc2d9dm-integrity: set ti->error on memory allocation failure | *e89228ddd5dm-ebs: fix prefetch-vs-suspend race | *0642f87cbfcrypto: ccp - Fix check for the primary ASP device | *8b75a7c1e4clk: qcom: gdsc: Set retain_ff before moving to HW CTRL | *c0322b7635clk: qcom: gdsc: Capture pm_genpd_add_subdomain result code | *62d14a1d2eclk: qcom: gdsc: Release pm subdomains in reverse add order | *3db0ca61cbcifs: fix integer overflow in match_server() | *b2a1833e1ccifs: avoid NULL pointer dereference in dbg call | *ad756ecd45thermal/drivers/rockchip: Add missing rk3328 mapping entry | *7a63f4fb0esctp: detect and prevent references to a freed transport in sendmsg | *974193e137mm/hwpoison: do not send SIGBUS to processes with recovered clean pages | *45970be1f0mm: add missing release barrier on PGDAT_RECLAIM_LOCKED unlock | *aa82be5125mm/rmap: reject hugetlb folios in folio_make_device_exclusive() | *36106d1c27sparc/mm: disable preemption in lazy mmu mode | *6eef9c02b6btrfs: fix non-empty delayed iputs list on unmount due to compressed write workers | *11a99abddaarm64: dts: mediatek: mt8173: Fix disp-pwm compatible string | *f4c4bb9eb3arm64: mm: Correct the update of max_pfn | *a84cbabf06mtd: rawnand: Add status chack in r852_ready() | *6af3b92b1cmtd: inftlcore: Add error check for inftl_read_oob() | *1c20a592a1mptcp: only inc MPJoinAckHMacFailure for HMAC failures | *855bf0aacdmptcp: fix NULL pointer in can_accept_new_subflow | *becd8185b5lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets | *a9e4bebec6locking/lockdep: Decrease nr_unused_locks if lock unused in zap_class() | *2edb5b29b1mfd: ene-kb3930: Fix a potential NULL pointer dereference | *3b4643ffafjbd2: remove wrong sb->s_sequence check | *d83b0c03efi3c: Add NULL pointer check in i3c_master_queue_ibi() | *e49341f7a6i3c: master: svc: Use readsb helper for reading MDB | *4e73e1f685smb311 client: fix missing tcon check when mounting with linux/posix extensions | *475b9b45dcsoc: samsung: exynos-chipid: Add NULL pointer check in exynos_chipid_probe() | *d3071c1b7cvdpa/mlx5: Fix oversized null mkey longer than 32bit | *35d0aa6db9ext4: fix off-by-one error in do_split | *3e7ecf181cbus: mhi: host: Fix race between unprepare and queue_buf | *8a021b7701ASoC: qdsp6: q6asm-dai: fix q6asm_dai_compr_set_params error path | *f4b34e1e97ASoC: qdsp6: q6apm-dai: fix capture pipeline overruns. | *ad3f29747aASoC: qdsp6: q6apm-dai: set 10 ms period and buffer alignment. * |055c0956b9Mergebe562a7f7f("io_uring/kbuf: reject zero sized provided buffers") into android14-6.1-lts |\| | *be562a7f7fio_uring/kbuf: reject zero sized provided buffers | *43736338e3wifi: mac80211: fix integer overflow in hwmp_route_info_get() | *5862c312f5wifi: mt76: Add check for devm_kstrdup() | *58f6dae978clocksource/drivers/stm32-lptimer: Use wakeup capable instead of init wakeup | *7312fc9ddemtd: Replace kcalloc() with devm_kcalloc() | *5ad7308011net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family | *b279480adcmtd: Add check for devm_kcalloc() | *12025f8350mptcp: sockopt: fix getting IPV6_V6ONLY | *0f9a4bab7dmedia: venus: hfi_parser: refactor hfi packet parsing logic | *26bbedd06dmedia: venus: hfi_parser: add check to avoid out of bound access | *bb786c8144media: i2c: ov7251: Introduce 1 ms delay between regulators and en GPIO | *2dd2d13c0bmedia: i2c: ov7251: Set enable GPIO low in probe | *a32e7319e6media: i2c: ccs: Set the device's runtime PM status correctly in probe | *26ddb187bamedia: i2c: ccs: Set the device's runtime PM status correctly in remove | *dc4620a0d8media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf() | *f8b29f2d90media: platform: stm32: Add check for clk_enable() | *b31a8ec0d8media: streamzap: prevent processing IR data on URB failure | *a3f4d28273tpm, tpm_tis: Fix timeout handling when waiting for TPM status | *9dd161f707mtd: rawnand: brcmnand: fix PM resume warning | *076cce6f50spi: cadence-qspi: Fix probe on AM62A LP SK | *07476e0d93KVM: arm64: Tear down vGIC on failed vCPU creation | *75791c0441arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list | *f2e4ca0c40arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB | *e03cc3e607arm64: errata: Add QCOM_KRYO_4XX_GOLD to the spectre_bhb_k24_list | *2ab5389f9darm64: cputype: Add MIDR_CORTEX_A76AE | *4b8cf3ca46xenfs/xensyms: respect hypervisor's "next" indication | *2257072fc6media: siano: Fix error handling in smsdvb_module_init() | *455fd2951bmedia: vim2m: print device name after registering device | *cf5f7bb4e0media: venus: hfi: add check to handle incorrect queue size | *4e95233af5media: venus: hfi: add a check to handle OOB in sfr region | *aaf8d62abemedia: i2c: adv748x: Fix test pattern selection mask | *ac8d33ae62ext4: don't treat fhandle lookup of ea_inode as FS corruption | *08a6459207bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags | *d2134bf402pwm: fsl-ftm: Handle clk_get_rate() returning 0 | *52bced4b6cpwm: rcar: Improve register calculation | *f3e9cf266cpwm: mediatek: Prevent divide-by-zero in pwm_mediatek_config() | *b79faed289tpm, tpm_tis: Workaround failed command reception on Infineon devices | *1a5b71022ektest: Fix Test Failures Due to Missing LOG_FILE Directories | *660a53a069fbdev: omapfb: Add 'plane' value check | *b951cf102fdrm/amdgpu: grab an additional reference on the gang fence v2 | *c2968c8123PCI: vmd: Make vmd_dev::cfg_lock a raw_spinlock_t type | *55ef52c30cdrm/amdgpu: handle amdgpu_cgs_create_device() errors in amd_powerplay_create() | *dd686b699bdrm/mediatek: mtk_dpi: Explicitly manage TVD clock in power on/off | *0003302ff2drm/mediatek: mtk_dpi: Move the input_2p_en bit to platform data | *4262d78491drm/amdkfd: Fix pqm_destroy_queue race with GPU reset | *57c9dabda8drm/amdkfd: Fix mode1 reset crash issue | *82b6aaa867drm/amdkfd: clamp queue size to minimum | *16961e025bdrivers: base: devres: Allow to release group on device release | *0b67e9c8e7drm/bridge: panel: forbid initializing a panel with unknown connector type | *55bd37d4bedrm: panel-orientation-quirks: Add quirk for OneXPlayer Mini (Intel) | *2f292d7e28drm: panel-orientation-quirks: Add new quirk for GPD Win 2 | *e6920a632adrm: panel-orientation-quirks: Add quirk for AYA NEO Slide | *c7b6d31422drm: panel-orientation-quirks: Add quirks for AYA NEO Flip DS and KB | *0f1abea4a0drm: panel-orientation-quirks: Add support for AYANEO 2S * |c80ed510deMergeb2ebe6c3ff("drm/amd/display: Update Cursor request mode to the beginning prefetch always") into android14-6.1-lts |\| | *b2ebe6c3ffdrm/amd/display: Update Cursor request mode to the beginning prefetch always | *b09c25c6b0drm: allow encoder mode_set even when connectors change for crtc | *6e5534f4f9Bluetooth: qca: simplify WCN399x NVM loading | *9cf7dccaa7Bluetooth: hci_uart: fix race during initialization | *1b1828b42ftracing: fix return value in __ftrace_event_enable_disable for TRACE_REG_UNREGISTER | *53fb25e90cnet: vlan: don't propagate flags on open | *31d4365223wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table | *f746fe0c51scsi: st: Fix array overflow in st_setup() | *cf9291a344ext4: ignore xattrs past end | *54f4e64de7ext4: protect ext4_release_dquot against freezing | *4d82ed5801ahci: add PCI ID for Marvell 88SE9215 SATA Controller | *98dbf2af63f2fs: fix to avoid out-of-bounds access in f2fs_truncate_inode_blocks() | *5b4fc3c402ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode | *a260bf14cdjfs: add sanity check for agwidth in dbMount | *c9541c2bd0jfs: Prevent copying of nlink with value 0 from disk inode | *55edbf5dbffs/jfs: Prevent integer overflow in AG size calculation | *7307c8a0ccfs/jfs: cast inactags to s64 to prevent potential overflow | *cab1852368jfs: Fix uninit-value access of imap allocated in the diMount() function | *90e089a645page_pool: avoid infinite loop to schedule delayed worker | *3d1b15f620f2fs: don't retry IO for corrupted data scenario | *c9c018678eASoC: amd: Add DMI quirk for ACP6X mic support | *908abfdfdbALSA: usb-audio: Fix CME quirk for UF series keyboards | *2de2827e5cmmc: dw_mmc: add a quirk for accessing 64-bit FIFOs in two halves | *4e587fb8b6ASoC: fsl_audmix: register card device depends on 'dais' property | *2bb2136ef5ALSA: hda: intel: Add Lenovo IdeaPad Z570 to probe denylist | *922c542886ALSA: hda: intel: Fix Optimus when GPU has no sound | *ddb1478852HID: pidff: Fix null pointer dereference in pidff_find_fields | *e916d4587bHID: pidff: Do not send effect envelope if it's empty | *fbb2f79b3cHID: pidff: Convert infinite length from Linux API to PID standard | *72be128730xen/mcelog: Add __nonstring annotations for unterminated strings | *4746f2dd81arm64: cputype: Add QCOM_CPU_PART_KRYO_3XX_GOLD | *36a7a63c39perf: arm_pmu: Don't disable counter in armpmu_add() | *5d2f3d433fx86/cpu: Don't clear X86_FEATURE_LAHF_LM flag in init_amd_k8() on AMD when running in a virtual machine | *87b9f0867cpm: cpupower: bench: Prevent NULL dereference on malloc failure | *eda5865869umount: Allow superblock owners to force umount | *08cf79c786fs: consistently deref the files table with rcu_dereference_raw() | *2f75cb27beiommu/mediatek: Fix NULL pointer deference in mtk_iommu_device_group | *4ffb746ecenft_set_pipapo: fix incorrect avx2 match of 5th field octet | *b78f2b458fnet: ppp: Add bound checking for skb data on ppp_sync_txmung | *a98d0ba2f6ipv6: Align behavior across nexthops during path selection | *1348214fa0net_sched: sch_sfq: move the limit validation | *d5108432f0net_sched: sch_sfq: use a temporary work area for validating configuration | *b64c8c75c9nvmet-fcloop: swap list_add_tail arguments | *25344c2a95ata: sata_sx4: Add error handling in pdc20621_i2c_read() | *ec9faff49anet: ethtool: Don't call .cleanup_data when prepare_data fails | *f6b84d1cfbtc: Ensure we have enough buffer space when sending filter netlink notifications | *3051d6d2d4net/sched: cls_api: conditional notification of events | *db5d2b27e4rtnl: add helper to check if a notification is needed | *8ab0c35a95rtnl: add helper to check if rtnl group has listeners | *f3ce4d3f87net: tls: explicitly disallow disconnect | *829c49b6b2codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() | *24e6280cddtipc: fix memory leak in tipc_link_xmit | *2dc53c7a0cata: pata_pxa: Fix potential NULL pointer dereference in pxa_ata_probe() | *d4d8662e6eselftests/futex: futex_waitv wouldblock test should fail *2b26f9c343Merge branch 'android14-6.1' into android14-6.1-lts Change-Id: I1c8bdcd91094e2f166307124d6f94efa65158437 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Merge
749a916a9c ("usb: dwc3: ep0: Don't clear ep0 DWC3_EP_TRANSFER_STARTED") into android14-6.1-lts
Merge
bdefb8ce7c ("tty: rp2: Fix reset with non forgiving PCIe host bridges") into android14-6.1-lts
Merge tag 'mm-hotfixes-stable-2022-12-10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
…
How do I submit patches to Android Common Kernels
-
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.
- Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux,
additions of
-
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:, orANDROID:. - 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
- tag the patch subject with
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 ofUPSTREAM:.- use the same tags as
UPSTREAM: - add comments about the changes under the
(cherry picked from commit ...)line - Example:
- use the same tags as
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 uselinux-nextfor example). - if changes were required, use
BACKPORT: FROMGIT: - Example:
- if the commit message in the maintainer tree is
- tag the patch subject with
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:
- tag the patch subject with
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:
- tag the patch subject with
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)
- tag the patch subject with
Description
Languages
C
97.7%
Assembly
1.6%
Makefile
0.3%
Perl
0.1%