mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 10:31:46 +09:00
002bba562dd371d9ead03f8a309bfdedd6b51230
This merges up to the 6.1.90 LTS release into the android14-6.1 branch. Included in here are the following commits: *c034535679Revert "macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads" *35df421fc4Revert "macsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst" *f17db53dd9Revert "net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec" *62184d7812Merge 6.1.90 into android14-6.1-lts |\ | *909ba1f1b4Linux 6.1.90 | *ca817d44benet/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec | *21e042d29emacsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst | *6536f12fe2macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads | *9b7c5004d7bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS | *4e75e222d3i2c: smbus: fix NULL function pointer dereference | *25b3498485phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered | *4201b8c8f2riscv: Fix TASK_SIZE on 64-bit NOMMU | *0b947c90e3riscv: fix VMALLOC_START definition | *023b6390a1dmaengine: idxd: Fix oops during rmmod on single-CPU platforms | *8bf5741832dma: xilinx_dpdma: Fix locking | *e71d5ec7c0phy: rockchip-snps-pcie3: fix clearing PHP_GRF_PCIESEL_CON bits | *199895b8b6phy: rockchip-snps-pcie3: fix bifurcation on rk3588 | *4723dfe76dphy: freescale: imx8m-pcie: fix pcie link-up instability | *ed4b981b1dphy: freescale: imx8m-pcie: Refine i.MX8MM PCIe PHY driver | *d6a6bacd0aphy: marvell: a3700-comphy: Fix hardcoded array size | *976df695f5phy: marvell: a3700-comphy: Fix out of bounds read | *2203a447fdidma64: Don't try to serve interrupts when device is powered off | *33d8e3e5f3dmaengine: tegra186: Fix residual calculation | *56bce3fcf8dmaengine: owl: fix register access functions | *a8e8c79ed2x86/tdx: Preserve shared bit on mprotect() | *2bd852307frust: remove `params` from `module` macro example | *ad371d69a6mtd: diskonchip: work around ubsan link failure | *4ebf1ff60eudp: preserve the connected status if only UDP cmsg | *e3f0519da4fbdev: fix incorrect address computation in deferred IO | *d0205d6e0astackdepot: respect __GFP_NOLOCKDEP allocation flag | *c35fc18071net: b44: set pause params only when interface is up | *8e2c583c26ethernet: Add helper for assigning packet type when dest address does not match device address | *ba234a54eeACPI: CPPC: Fix access width used for PCC registers | *0f708a7e0aACPI: CPPC: Fix bit_offset shift in MASK_VAL() macro | *01fc53be67ACPI: CPPC: Use access_width over bit_width for system memory accesses | *dd681710abirqchip/gic-v3-its: Prevent double free on error | *64f9d8ac2cdrm/amdgpu: Fix leak when GPU memory allocation fails | *404b0ae432drm/amdgpu/sdma5.2: use legacy HDP flush for SDMA2/3 | *ffddf569e3arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma | *ba9bcc0e58LoongArch: Fix access error when read fault on a write-only VMA | *94021d1d2bLoongArch: Fix callchain parse error with kernel tracepoint events | *38f17d1fbbcpu: Re-enable CPU mitigations by default for !X86 architectures | *8bdbcfaf3ebtrfs: fix information leak in btrfs_ioctl_logical_to_ino() | *0561b65fbdHID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up | *c7a4bca289smb3: fix lock ordering potential deadlock in cifs_sync_mid_result | *2b8bf690e0smb: client: Fix struct_group() usage in __packed structs | *a957ea5aa3mmc: sdhci-msm: pervent access to suspended controller | *e60502b907Bluetooth: qca: fix NULL-deref on non-serdev suspend | *e6dd0117e9Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853 | *c788236289Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old() | *4e6cd21498rust: make mutually exclusive with CFI_CLANG | *9f882077f5rust: don't select CONSTRUCTORS | *6a190e7ca4x86/cpu: Fix check for RDPKRU in __show_regs() | *0c42f7e039fork: defer linking file vma until vma is fully initialized | *539a2b995avirtio_net: Do not send RSS key if it is not supported | *34410fcad9Revert "crypto: api - Disallow identical driver names" | *b3686200adcifs: Replace remaining 1-element arrays | *2ceacda270af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc(). | *f05caed833net: ethernet: ti: am65-cpts: Fix PTPv1 message type on TX packets | *777d7d0049iavf: Fix TC config comparison with existing adapter TC config | *81ad28ac21i40e: Report MFS in decimal base instead of hex | *152ed360cfi40e: Do not use WQ_MEM_RECLAIM flag for workqueue | *13ba94f6ccnetfilter: nf_tables: honor table dormant flag from netdev release event path | *e325357440eth: bnxt: fix counting packets discarded due to OOM and netpoll | *5bfe7bf965mlxsw: spectrum_acl_tcam: Fix memory leak when canceling rehash work | *4526a56e02mlxsw: spectrum_acl_tcam: Fix incorrect list API usage | *751d352858mlxsw: spectrum_acl_tcam: Fix warning during rehash | *b822644fd9mlxsw: spectrum_acl_tcam: Fix memory leak during rehash | *78884187c0mlxsw: spectrum_acl_tcam: Rate limit error message | *813e2ab753mlxsw: spectrum_acl_tcam: Fix possible use-after-free during rehash | *b996e8699dmlxsw: spectrum_acl_tcam: Fix possible use-after-free during activity update | *19ebdce660mlxsw: spectrum_acl_tcam: Fix race during rehash delayed work | *bca6fa2d9anet: openvswitch: Fix Use-After-Free in ovs_ct_exit | *f4861f052fipvs: Fix checksumming on GSO of SCTP packets | *4115403dc9Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional() | *31f18a1f58Bluetooth: hci_sync: Using hci_cmd_sync_submit when removing Adv Monitor | *14051cbcf3Bluetooth: MGMT: Fix failing to MGMT_OP_ADD_UUID/MGMT_OP_REMOVE_UUID | *25a1c2d4b1net: gtp: Fix Use-After-Free in gtp_dellink | *5e5e1865b7net: usb: ax88179_178a: stop lying about skb->truesize | *7a25bfd127ipv4: check for NULL idev in ip_route_use_hint() | *1e9b694597net: fix sk_memory_allocated_{add|sub} vs softirqs | *82810873acnet: make SK_MEMORY_PCPU_RESERV tunable | *0d14f10402ax25: Fix netdev refcount issue | *424c69dbb2NFC: trf7970a: disable all regulators on removal | *25a82005d5bnxt_en: Fix the PCI-AER routines | *b20beb0598bnxt_en: refactor reset close code | *16be600293bridge/br_netlink.c: no need to return void function | *599c9ad5e1icmp: prevent possible NULL dereferences from icmp_build_probe() | *d3c4b14c8aARM: dts: microchip: at91-sama7g5ek: Replace regulator-suspend-voltage with the valid property | *3f7ecad54cmlxsw: core: Unregister EMAD trap using FORWARD action | *9064163f1cvxlan: drop packets from invalid src-address | *9b9c4adad6wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd | *d20e3beb83wifi: iwlwifi: mvm: remove old PASN station when adding a new one | *bab058e31aARC: [plat-hsdk]: Remove misplaced interrupt-cells property | *0277e73e8earm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro | *af45b5bc30arm64: dts: mediatek: mt2712: fix validation errors | *1aea205a42arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block | *d078de8674arm64: dts: mediatek: mt7622: fix ethernet controller "compatible" | *da3c0740f0arm64: dts: mediatek: mt7622: fix IR nodename | *ce782b5a74arm64: dts: mediatek: mt7622: fix clock controllers | *818f56a8b3arm64: dts: mediatek: mt8195-cherry: Update min voltage constraint for MT6315 | *942debbea5arm64: dts: mediatek: mt8192-asurada: Update min voltage constraint for MT6315 | *e8ac4490dbarm64: dts: mediatek: mt8195: Add missing gce-client-reg to mutex | *5bcfc53373arm64: dts: mediatek: mt8195: Add missing gce-client-reg to vpp/vdosys | *18548e2ab9arm64: dts: mediatek: mt8192: Add missing gce-client-reg to mutex | *2f83d4763aarm64: dts: mediatek: mt8183: Add power-domains properity to mfgcfg | *475816446farm64: dts: rockchip: Remove unsupported node from the Pinebook Pro dts | *076ff06a1earm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma | *aa1af71deearm64: dts: rockchip: fix alphabetical ordering RK3399 puma | *cb5b05e619arm64: dts: rockchip: enable internal pull-up on Q7_USB_ID for RK3399 Puma | *9ab1d84bdbarm64: dts: rockchip: set PHY address of MT7531 switch to 0x1f | *526facda61HID: logitech-dj: allow mice to use all types of reports | *6b0ac25f36HID: intel-ish-hid: ipc: Fix dev_err usage with uninitialized dev->devc | *4f83ca4c7acifs: reinstate original behavior again for forceuid/forcegid | *e24e165190smb: client: fix rename(2) regression against samba * |beb491c1c2Merge 6.1.89 into android14-6.1-lts |\| | *dcbc050cb0Linux 6.1.89 | *8a5291736eRevert "ASoC: ti: Convert Pandora ASoC to GPIO descriptors" * |3b75c4ca77ANDROID: update .stg for change to struct clk_core * |077eb0a09dRevert "usb: xhci: Add timeout argument in address_device USB HCD callback" * |992f4a2013Merge 6.1.88 into android14-6.1-lts |\| | *f2295faba5Linux 6.1.88 | *0f7908a016PCI/ASPM: Fix deadlock when enabling ASPM | *67a877128bksmbd: common: use struct_group_attr instead of struct_group for network_open_info | *4687606d94ksmbd: clear RENAME_NOREPLACE before calling vfs_rename | *21ff9d7d22ksmbd: validate request buffer size in smb2_allocate_rsp_buf() | *b80ba64871ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf | *7d51db455cnet: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards | *41a004ffbanet: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530 | *d9c2f69cc1net: dsa: introduce preferred_default_local_cpu_port and use on MT7530 | *013c787d23net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP | *897ac5306bnilfs2: fix OOB in nilfs_set_de_type | *1e7feb31a1bootconfig: use memblock_free_late to free xbc memory to buddy | *ad74d208f2nouveau: fix instmem race condition around ptr stores | *bcff1ed2ffdrm/vmwgfx: Fix crtc's atomic check conditional | *8f79b42d1cdrm/vmwgfx: Sort primary plane formats by order of preference | *212e3baccddrm/amdgpu: validate the parameters of bo mapping operations more clearly | *5ef7ba2799mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled | *76c2f4d426init/main.c: Fix potential static_command_line memory overflow | *f7e71a7cf3arm64: hibernate: Fix level3 translation fault in swsusp_save() | *e09465aeccKVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms | *0fb74c00d1KVM: x86/pmu: Disable support for adaptive PEBS | *e487b8eccfKVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible | *5d43e07228fs: sysfs: Fix reference leak in sysfs_break_active_protection() | *89af25bd4bspeakup: Avoid crash on very long word | *7c6f941492mei: me: disable RPL-S on SPS and IGN firmwares | *0588bbbd71usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error | *a676b17edbusb: Disable USB3 LPM at shutdown | *9de10b59d1usb: dwc2: host: Fix dereference issue in DDMA completion flow. | *8672ad663aRevert "usb: cdc-wdm: close race between read and workqueue" | *4ed7c7720aUSB: serial: option: add Telit FN920C04 rmnet compositions | *19f98f214bUSB: serial: option: add Rolling RW101-GL and RW135-GL support | *25a299c566USB: serial: option: support Quectel EM060K sub-models | *9eba075025USB: serial: option: add Lonsung U8300/U9300 product | *3e34029b3cUSB: serial: option: add support for Fibocom FM650/FG650 | *3c4ba8a6c5USB: serial: option: add Fibocom FM135-GL variants | *282b223cfdserial: stm32: Reset .throttled state in .startup() | *87d15af82dserial: stm32: Return IRQ_NONE in the ISR if no handling happend | *bbaafbb465serial/pmac_zilog: Remove flawed mitigation for rx irq flood | *2c9b943e99serial: mxs-auart: add spinlock around changing cts state | *ac882d6b21comedi: vmk80xx: fix incomplete endpoint checking | *9eae1facfcthunderbolt: Fix wake configurations after device unplug | *38e10c9faathunderbolt: Avoid notify PM core about runtime PM resume | *a6d2a8b211binder: check offset alignment in binder_get_object() | *d05380576fALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC | *943c3e45c8x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ | *d17075a935x86/bugs: Fix BHI retpoline check | *165d226472clk: mediatek: Do a runtime PM get on controllers during probe | *c1d87d56afclk: mediatek: clk-mtk: Extend mtk_clk_simple_probe() | *a4fe8813a7clk: mediatek: clk-mux: Propagate struct device for mtk-mux | *6f5f72a684clk: mediatek: clk-mtk: Propagate struct device for composites | *082b831488clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates() | *647a25b07dclk: mediatek: mt8192: Propagate struct device for gate clocks | *0904f9ef91clk: mediatek: mt8192: Correctly unregister and free clocks on failure | *83ada89e4aclk: Get runtime PM before walking tree for clk_summary | *5a704c267aclk: Show active consumers of clocks in debugfs | *5833b99cf8clk: remove unnecessary (void*) conversions | *a424e713e0clk: Get runtime PM before walking tree during disable_unused | *5558b3b68cclk: Initialize struct clk_core kref earlier | *43bc4cfef2clk: Print an info line before disabling unused clocks | *349dbfd65fclk: Remove prepare_lock hold assertion in __clk_release() | *f6ac4fdfa5usb: new quirk to reduce the SET_ADDRESS request timeout | *5f9b63193busb: xhci: Add timeout argument in address_device USB HCD callback | *1d011d972fdrm: panel-orientation-quirks: Add quirk for Lenovo Legion Go | *7989b04d6cALSA: scarlett2: Rename scarlett_gen2 to scarlett2 | *39f932d295PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word() | *636f0fdb36PCI/DPC: Use FIELD_GET() | *aedbd09614ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support | *03bfe0e936ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support | *7c02a4a6ccALSA: scarlett2: Add correct product series name to messages | *b928cde9c0ALSA: scarlett2: Default mixer driver to enabled | *0f4048e1a0ASoC: ti: Convert Pandora ASoC to GPIO descriptors | *e2b8480b70ALSA: scarlett2: Add support for Clarett 8Pre USB | *4d74cb9cdfALSA: scarlett2: Move USB IDs out from device_info struct | *bbdfa14482PCI: switchtec: Add support for PCIe Gen5 devices | *87709f7ecdPCI: switchtec: Use normal comment style | *89a9196aecPCI: Execute quirk_enable_clear_retrain_link() earlier | *caa7ff1d7dthunderbolt: Add debug log for link controller power quirk | *932a765100thunderbolt: Log function name of the called quirk | *4b7ed2400ex86/quirks: Include linux/pnp.h for arch_pnpbios_disabled() | *f4aae2afe2PCI: Delay after FLR of Solidigm P44 Pro NVMe | *0fe6a97a5fusb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info() | *c96b07dca1HID: kye: Sort kye devices | *57aadcc028PCI: Avoid FLR for SolidRun SNET DPU rev 1 | *3c55d4396bARM: omap2: n8x0: stop instantiating codec platform data | *c330a13ab7drm/panel: visionox-rm69299: don't unregister DSI device | *5fd4b09030drm: nv04: Fix out of bounds access | *559f3a6333s390/cio: fix race condition during online processing | *beb3ff19a5s390/qdio: handle deferred cc1 | *fe446927f8RDMA/mlx5: Fix port number for counter query in multi-port configuration | *ea42dbe759RDMA/cm: Print the old state when cm_destroy_id gets timeout | *196617d07dRDMA/rxe: Fix the problem "mutex_destroy missing" | *45e811bab2net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them | *e86c9db58enet: dsa: mt7530: fix mirroring frames received on local port | *62e27ef18etun: limit printing rate when illegal packet received by tun dev | *6a6ebec408ice: tc: allow zero flags in parsing tc flower | *46efa4d593net/mlx5e: Prevent deadlock while disabling aRFS | *8635ac7dd9net/mlx5: Lag, restore buckets number to default after hash LAG deactivation | *ba0db46385af_unix: Don't peek OOB data without MSG_OOB. | *a1d3e3521faf_unix: Call manage_oob() for every skb in unix_stream_read_generic(). | *f1c3c61701netfilter: flowtable: incorrect pppoe tuple | *8bf7c76a2anetfilter: flowtable: validate pppoe header | *41d8fdf3afnetfilter: nft_set_pipapo: do not free live element | *b13db0d16bnetfilter: br_netfilter: skip conntrack input hook for promisc packets | *df7c0fb8c2netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get() | *8d56bad42anetfilter: nf_tables: Fix potential data-race in __nft_expr_type_get() | *408a43b6c9x86/efistub: Remap kernel text read-only before dropping NX attribute | *f56faf87c1x86/sev: Move early startup code into .head.text section | *d6f5bc5ff0x86/sme: Move early SME kernel encryption handling into .head.text | *e6489cc45fx86/head/64: Move the __head definition to <asm/init.h> | *bbcd0534a3x86/head/64: Add missing __head annotation to startup_64_load_idt() | *20dc656b06x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros | *d327e96157x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section | *c4421279b6x86/boot: Increase section and file alignment to 4k/512 | *581f5d5e02x86/boot: Split off PE/COFF .data section | *43b1920588x86/boot: Drop PE/COFF .reloc section | *d03399c3e2x86/boot: Construct PE/COFF .text section from assembler | *1fa0a21475x86/boot: Derive file size from _edata symbol | *1c754c6ec9x86/boot: Define setup size in linker script | *f9d68334ddx86/boot: Set EFI handover offset directly in header asm | *e1380c923cx86/boot: Grab kernel_info offset from zoffset header directly | *67b8dc5089x86/boot: Drop references to startup_64 | *33d38d9b35x86/boot: Drop redundant code setting the root device | *5c3e92ad49x86/boot: Omit compression buffer from PE/COFF image memory footprint | *f31f521ad2x86/boot: Remove the 'bugger off' message | *0db16d1dcex86/efi: Drop alignment flags from PE section headers | *1800c9628ex86/efistub: Reinstate soft limit for initrd loading | *f46e0e9fbex86/efi: Disregard setup header of loaded image | *f5603f9e13x86/efi: Drop EFI stub .bss from .data section | *704edc9252drm/i915/vma: Fix UAF on destroy against retire race | *add0ff3486net: usb: ax88179_178a: avoid writing the mac address before first reading | *07b37f227crandom: handle creditable entropy from atomic process context | *bcdd9ce78dselftests/ftrace: Limit length in subsystem-enable tests | *45eec81eacSUNRPC: Fix rpcgss_context trace event acceptor field | *cbe7b911e0io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure | *121a83be21drm/amd/display: Do not recursively call manual trigger programming | *01c227f5a7drm/amdgpu: fix incorrect number of active RBs for gfx11 | *87f8aac740drm/amdgpu: fix incorrect active rb bitmap for gfx11 | *1e05339968drm/vmwgfx: Enable DMA mappings with SEV * |af0a15ff84Merge 6.1.87 into android14-6.1-lts |\| | *6741e066ecLinux 6.1.87 | *724fbc7c0cdrm/amd/display: fix disable otg wa logic in DCN316 | *90819b1830drm/amdgpu: always force full reset for SOC21 | *7cc89dbcb8drm/amdgpu: Reset dGPU if suspend got aborted | *29bd4d05f2drm/i915: Disable port sync when bigjoiner is used | *2bc1796f8edrm/i915/cdclk: Fix CDCLK programming order when pipes are active | *d844df1100x86/bugs: Replace CONFIG_SPECTRE_BHI_{ON,OFF} with CONFIG_MITIGATION_SPECTRE_BHI | *7f18a0df76x86/bugs: Remove CONFIG_BHI_MITIGATION_AUTO and spectre_bhi=auto | *d737d8cd8ex86/bugs: Clarify that syscall hardening isn't a BHI mitigation | *4b0b5d621ex86/bugs: Fix BHI handling of RRSBA | *dc2db3e978x86/bugs: Rename various 'ia32_cap' variables to 'x86_arch_cap_msr' | *b1b32586f7x86/bugs: Cache the value of MSR_IA32_ARCH_CAPABILITIES | *662e341e57x86/bugs: Fix BHI documentation | *0d433e4082x86/bugs: Fix return type of spectre_bhi_state() | *d447d8de84irqflags: Explicitly ignore lockdep_hrtimer_exit() argument | *22f51ddb0cx86/apic: Force native_apic_mem_read() to use the MOV instruction | *881b495ed2selftests: timers: Fix abs() warning in posix_timers test | *9c09773917x86/cpu: Actually turn off mitigations by default for SPECULATION_MITIGATIONS=n | *0c182182d6perf/x86: Fix out of range data | *a2c1c0cfabvhost: Add smp_rmb() in vhost_enable_notify() | *f6e2d61dc1vhost: Add smp_rmb() in vhost_vq_avail_empty() | *18c8cc6680drm/client: Fully protect modes[] with dev->mode_config.mutex | *8a6fea3fcbdrm/ast: Fix soft lockup | *d29b50a32cdrm/amdkfd: Reset GPU on queue preemption failure | *4b53d7d620drm/i915/vrr: Disable VRR when using bigjoiner | *62029bc9ffkprobes: Fix possible use-after-free issue on kprobe registration | *88dd8bb129io_uring/net: restore msg_control on sendzc retry | *c00146b399btrfs: qgroup: convert PREALLOC to PERTRANS after record_root_in_trans | *06fe999854btrfs: record delayed inode root in transaction | *cb3131b5a2btrfs: qgroup: correctly model root qgroup rsv in convert | *5f1205b86biommu/vt-d: Allocate local memory for page request queue | *91580ea48btracing: hide unused ftrace_event_id_fops | *19ff8fed33net: ena: Fix incorrect descriptor free behavior | *7d44e12efbnet: ena: Wrong missing IO completions check order | *4dea83d483net: ena: Fix potential sign extension issue | *b75722be42af_unix: Fix garbage collector racing against connect() | *fb6d14e23daf_unix: Do not use atomic ops for unix_sk(sk)->inflight. | *19643bf8c9net: dsa: mt7530: trap link-local frames regardless of ST Port State | *8edb087c44net: sparx5: fix wrong config being used when reconfiguring PCS | *88a50c8a50net/mlx5e: HTB, Fix inconsistencies with QoS SQs number | *ad26f26abdnet/mlx5e: Fix mlx5e_priv_init() cleanup flow | *2e8dc5cffcnet/mlx5: Properly link new fs rules into the tree | *c760089aa9netfilter: complete validation of user input | *9d42f37339Bluetooth: L2CAP: Fix not validating setsockopt user input | *7bc65d23baBluetooth: SCO: Fix not validating setsockopt user input | *de76ae9ea1ipv6: fix race condition between ipv6_get_ifaddr and ipv6_del_addr | *03d564999fipv4/route: avoid unused-but-set-variable warning | *2c46877f5fipv6: fib: hide unused 'pn' variable | *7e33f68791octeontx2-af: Fix NIX SQ mode and BP config | *84a352b7ebaf_unix: Clear stale u->oob_skb. | *492337a4fbnet: ks8851: Handle softirqs at the end of IRQ thread to fix hang | *be03315452net: ks8851: Inline ks8851_rx_skb() | *ecedcd7e39bnxt_en: Reset PTP tx_avail after possible firmware reset | *4a1b65d1e5geneve: fix header validation in geneve[6]_xmit_skb | *2a523f14a3xsk: validate user input for XDP_{UMEM|COMPLETION}_FILL_RING | *ac1c10b4ebu64_stats: fix u64_stats_init() for lockdep when used repeatedly in one file | *0b44500559net: openvswitch: fix unwanted error log on timeout policy probing | *9fc74e367bscsi: qla2xxx: Fix off by one in qla_edif_app_getstats() | *438b9a71b2scsi: hisi_sas: Modify the deadline for ata_wait_after_reset() | *b7dc2e6b87nouveau: fix function cast warning | *84fb600635Revert "drm/qxl: simplify qxl_fence_wait" | *24c0c5867aarm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order | *49054b3ed2media: cec: core: remove length check of Timer Status | *bccc8d1550PM: s2idle: Make sure CPUs will wakeup directly on resume | *bd9b94055cdrm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11 | *66fab1e120Bluetooth: Fix memory leak in hci_req_sync_complete() | *2d5f12de4cring-buffer: Only update pages_touched when a new page is touched | *3fe79b2c83batman-adv: Avoid infinite loop trying to resize local TT | *0559b2d759ata: libata-scsi: Fix ata_scsi_dev_rescan() error path | *ca5962bdc5smb3: fix Open files on server counter going negative * |37db5a6cacReapply "scsi: core: Add struct for args to execution functions" * |faf34a67ebMerge 6.1.86 into android14-6.1-lts |\| | *cd5d98c055Linux 6.1.86 | *c5f9fe2c1eRevert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()" | *eea65ed738VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler() | *cea93dae3enet: mpls: error out if inner headers are not set | *21f5cfed1eBluetooth: btintel: Fixe build regression | *00e34ff1ceplatform/x86: intel-vbtn: Update tablet mode switch at end of probe | *e80b4980afrandomize_kstack: Improve entropy diffusion | *649e564636virtio: reenable config if freezing device failed | *3a9c459091scsi: sd: usb_storage: uas: Access media prior to querying device properties | *345b6b8319Revert "scsi: core: Add struct for args to execution functions" | *f1465ff4c8Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties" | *cf0650adb6gcc-plugins/stackleak: Avoid .head.text section | *2b85977977tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc | *2aeb805a1bnetfilter: nf_tables: discard table flag update with pending basechain deletion | *8d3a58af50netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path | *fcd1993a29netfilter: nf_tables: release batch on table validation from abort path | *664206ff8bfbmon: prevent division by zero in fb_videomode_from_videomode() | *30044c66bcdrivers/nvme: Add quirks for device 126f:2262 | *5245a6da27io_uring: clear opcode specific data for an early failure | *f8a7b7b085fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2 | *8b849265daASoC: soc-core.c: Skip dummy codec when adding platforms | *103c0f946fthermal/of: Assume polling-delay(-passive) 0 when absent | *409289d0a1usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined | *57e6634e59usb: typec: tcpci: add generic tcpci fallback compatible | *f692c547e3thunderbolt: Keep the domain powered when USB4 port is in redrive mode | *893b256261usb: gadget: uvc: mark incomplete frames with UVC_STREAM_ERR | *7dbf082988bus: mhi: host: Add MHI_PM_SYS_ERR_FAIL state | *63eaa43d5dtools: iio: replace seekdir() in iio_generic_buffer | *1e9f5619d9ring-buffer: use READ_ONCE() to read cpu_buffer->commit_page in concurrent environment | *5e7da5bb2dktest: force $buildonly = 1 for 'make_warnings_file' test type | *39da708cb2perf/x86/amd/lbr: Discard erroneous branch entries | *44479c7fefplatform/x86: touchscreen_dmi: Add an extra entry for a variant of the Chuwi Vi8 tablet | *70310e55b5Input: allocate keycode for Display refresh rate toggle | *055e406d7bInput: imagis - use FIELD_GET where applicable | *4097b1f10fRDMA/cm: add timeout to cm_destroy_id wait | *512a01da71block: prevent division by zero in blk_rq_stat_sum() | *c87e811caeinput/touchscreen: imagis: Correct the maximum touch area value | *b7d153bfbalibperf evlist: Avoid out-of-bounds access | *aaefa79c15Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" | *43be051f35SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int | *3a94feab04drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init() | *354a5d7bb7drm/amd/display: Fix nanosec stat overflow | *aba664845aext4: forbid commit inconsistent quota data when errors=remount-ro | *baba351068ext4: add a hint for block bitmap corrupt state in mb_groups | *b75395ec4bALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter | *84ed33a082media: sta2x11: fix irq handler cast | *2e2177f94cJulia Lawall reported this null pointer dereference, this should fix it. | *3f3c1e735drcu-tasks: Repair RCU Tasks Trace quiescence check | *eae948ecd5ASoC: Intel: common: DMI remap for rebranded Intel NUC M15 (LAPRC710) laptops | *13701b0f01isofs: handle CDs with bad root inode but good Joliet root directory | *ee0b5f96b6scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc() | *53cb1e52c9sysv: don't call sb_bread() with pointers_lock held | *5238e1c2bdpinctrl: renesas: checker: Limit cfg reg enum checks to provided IDs | *c87dd15918drm: panel-orientation-quirks: Add quirk for GPD Win Mini | *ac1e0f080aInput: synaptics-rmi4 - fail probing if memory allocation for "phys" fails | *48bfb4b03cdrm/vc4: don't check if plane->state->fb == state->fb | *a83a7728e4Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 | *b19fe5eea6Bluetooth: btintel: Fix null ptr deref in btintel_read_version | *d7ee3bf0canet/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list() | *5693dd6d3dice: use relative VSI index for VFs instead of PF VSI number | *9ae356c627btrfs: send: handle path ref underflow in header iterate_inode_ref() | *0f30f95b91btrfs: export: handle invalid inode or root reference in btrfs_get_parent() | *36c2a2863bbtrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks() | *50bd749c60cpufreq: Don't unregister cpufreq cooling on CPU hotplug | *6597a6687awifi: ath11k: decrease MHI channel buffer length to 8KB | *4e0cfb25d4dma-direct: Leak pages on dma_set_decrypted() failure | *a3f6045ce3net: pcs: xpcs: Return EINVAL in the internal methods | *51a9b20a04tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num() | *635594cca5pstore/zone: Add a null pointer check to the psz_kmsg_read | *8ead0a04a7wifi: brcmfmac: Add DMI nvram filename quirk for ACEPC W5 Pro | *161d6b8037firmware: tegra: bpmp: Return directly after a failed kzalloc() in get_filename() | *8af60bb2b2net: skbuff: add overflow debug check to pull/push helpers | *b8ca15861cionic: set adminq irq affinity | *6925d11fbdarm64: dts: rockchip: fix rk3399 hdmi ports node | *a292048934arm64: dts: rockchip: fix rk3328 hdmi ports node | *b510fbe3a7cpuidle: Avoid potential overflow in integer multiplication | *94b016b28bpanic: Flush kernel log buffer at the end | *8d80e09202wifi: iwlwifi: pcie: Add the PCI device id for new hardware | *feacd430b4VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() | *fd5fdacae9wifi: rtw89: pci: enlarge RX DMA buffer to consider size of RX descriptor | *d6b0472d5fbnx2x: Fix firmware version string character counts | *7dd4831c3ewifi: ath9k: fix LNA selection in ath_ant_try_scan() | *e6768c6737amdkfd: use calloc instead of kzalloc to avoid integer overflow * |a28d27f66eANDROID: fix crc issue in net/ipv4/inet_fragment.c * |da08c217d8ANDROID: preserve CRC values in struct sk_buff due to ip_defrag_offset removal * |416b90bf47Revert "vsock/virtio: fix packet delivery to tap device" * |66a1080110Merge 6.1.85 into android14-6.1-lts |\| | *bf1e3b1cb1Linux 6.1.85 | *e21838dfd0x86: set SPECTRE_BHI_ON as default | *3e4283b771KVM: x86: Add BHI_NO | *43704e993ax86/bhi: Mitigate KVM by default | *bb8384b6dfx86/bhi: Add BHI mitigation knob | *42196bdec0x86/bhi: Enumerate Branch History Injection (BHI) bug | *29c50bb6fbx86/bhi: Define SPEC_CTRL_BHI_DIS_S | *07dbb10f15x86/bhi: Add support for clearing branch history at syscall entry | *74fcb18177x86/syscall: Don't force use of indirect calls for system calls | *fd52c0397bx86/bugs: Change commas to semicolons in 'spectre_v2' sysfs file | *5e6898b854nvme: fix miss command type check | *9c2b4b6577mm/secretmem: fix GUP-fast succeeding on secretmem folios | *a6dc534c07selftests: mptcp: display simult in extra_msg | *d1fefedc1amptcp: don't account accept() of non-MPC client as fallback to TCP | *08ef93ebc7selftests: mptcp: join: fix dev in check_endpoint | *7e8360ac87smb: client: fix potential UAF in cifs_signal_cifsd_for_reconnect() | *f941400479smb: client: fix potential UAF in smb2_is_network_name_deleted() | *494c91e1e9smb: client: fix potential UAF in is_valid_oplock_break() | *c868cabdf6smb: client: fix potential UAF in smb2_is_valid_lease_break() | *84488466b7smb: client: fix potential UAF in smb2_is_valid_oplock_break() | *16b7d78577smb: client: fix potential UAF in cifs_stats_proc_show() | *8fefd166fcsmb: client: fix potential UAF in cifs_stats_proc_write() | *2290423146smb: client: fix potential UAF in cifs_debug_files_proc_show() | *8c99dfb49bsmb3: retrying on failed server close | *f6583444d7riscv: process: Fix kernel gp leakage | *c88f7a7095riscv: Fix spurious errors from __get/put_kernel_nofault | *447d844a3es390/entry: align system call table on 8 bytes | *22943e4fe4x86/coco: Require seeding RNG with RDRAND on CoCo systems | *20a915154cx86/mce: Make sure to grab mce_sysfs_mutex in set_bank() | *97e93367e8x86/mm/pat: fix VM_PAT handling in COW mappings | *7b6df050c4of: dynamic: Synchronize of_changeset_destroy() with the devlink removals | *9406d598a1driver core: Introduce device_link_wait_removal() | *f35d7ede62ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone | *2ff8f06550ALSA: hda/realtek - Fix inactive headset mic jack | *883e072e83ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 | *51a6c2af9dksmbd: validate payload size in ipc response | *2e5f8dc1deksmbd: don't send oplock break if rename fails | *7ef6a7f9b3x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk | *c19715ec25nfsd: hold a lighter-weight client reference over CB_RECALL_ANY | *12059cf048ata: sata_mv: Fix PCI device ID table declaration compilation warning | *78942ac754cifs: Fix caching to try to do open O_WRONLY as rdwr on server | *9adcfd5670scsi: sd: Unregister device if device_add_disk() failed in sd_probe() | *4b87c1bc25scsi: mylex: Fix sysfs buffer lengths | *7171d6aef1ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit | *7ff957cea8ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw | *4ff3d8ac62ASoC: rt711-sdw: fix locking sequence | *044c34fe35ASoC: rt711-sdca: fix locking sequence | *eb028d1ebdASoC: rt5682-sdw: fix locking sequence | *392c47fea7drm/panfrost: fix power transition timeout warnings | *81f7c9da2bdrivers/perf: riscv: Disable PERF_SAMPLE_BRANCH_* while not supported | *d00c24ddec9p: Fix read/write debug statements to report server reply | *90a477dfdafs/pipe: Fix lockdep false-positive in watchqueue pipe_write() | *4af6d5b4d9KVM: SVM: Add support for allowing zero SEV ASIDs | *2233bd583cKVM: SVM: Use unsigned integers when dealing with ASIDs | *815c2a1c43KVM: SVM: WARN, but continue, if misc_cg_set_capacity() fails | *2f7efda53aKVM: SVM: enhance info printk's in SEV init | *f089d4554anet: ravb: Always update error counters | *f9690dfa18net: ravb: Always process TX descriptor ring | *265a0fc55fnet: ravb: Let IP-specific receive function to interrogate descriptors | *b3608fe28fnet: fec: Set mac_managed_pm during probe | *c178122207drivers: net: convert to boolean for the mac_managed_pm flag | *4eed9d0a48tcp: Fix bind() regression for v6-only wildcard and v4(-mapped-v6) non-wildcard addresses. | *77db987b47r8169: prepare rtl_hw_aspm_clkreq_enable for usage in atomic context | *9109472e71r8169: use spinlock to protect access to registers Config2 and Config5 | *a33b7cb184r8169: use spinlock to protect mac ocp register access | *095cfa2d9bi40e: Enforce software interrupt during busy-poll exit | *2f6953617di40e: Remove _t suffix from enum type names | *f3c2ceb847i40e: Store the irq number in i40e_q_vector | *810dd068aedrm/amd: Flush GFXOFF requests in prepare stage | *43df8e64dfdrm/amd: Add concept of running prepare_suspend() sequence for IP blocks | *2990d8eacddrm/amd: Evict resources during PM ops prepare() callback | *3e89846283i40e: fix vf may be used uninitialized in this function warning | *fe74ea5b8bi40e: fix i40e_count_filters() to count only active/new filters | *d417e3c16docteontx2-af: Add array index check | *e7e7030f0aocteontx2-pf: check negative error code in otx2_open() | *39efe5b6f6octeontx2-af: Fix issue with loading coalesced KPU profiles | *940ff35ae8udp: prevent local UDP tunnel packets from being GROed | *8c58d38405udp: do not transition UDP GRO fraglist partial checksums to unnecessary | *d12245080cudp: do not accept non-tunnel GSO skbs landing in a tunnel | *fd6692e9b5r8169: skip DASH fw status checks when DASH is disabled | *80247e0ecamlxbf_gige: stop interface during shutdown | *167d4b47a9ipv6: Fix infinite recursion in fib6_dump_done(). | *2febb7eeb4selftests: reuseaddr_conflict: add missing new line at the end of the output | *1db7fcb2b2erspan: make sure erspan_base_hdr is present in skb->head | *1829b618cci40e: Fix VF MAC filter removal | *ed37bdaee6x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO | *23178ec5abx86/bugs: Fix the SRSO mitigation on Zen3/4 | *2eeab8c47cgro: fix ownership transfer | *66cb665900selftests: net: gro fwd: update vxlan GRO test expectations | *1060816169net: phy: micrel: Fix potential null pointer dereference | *77f5e52d7bnet: phy: micrel: lan8814: Fix when enabling/disabling 1-step timestamping | *e01835f3a1net: stmmac: fix rx queue priority assignment | *b7d1ce2cc7net/sched: fix lockdep splat in qdisc_tree_reduce_backlog() | *55d3fe7b2bnet/sched: act_skbmod: prevent kernel-infoleak | *a44770fed8bpf, sockmap: Prevent lock inversion deadlock in map delete elem | *8a57544e92vboxsf: Avoid an spurious warning if load_nls_xxx() fails | *18aae2cb87netfilter: validate user input for expected length | *9b5b7708ecnetfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get() | *4e8447a9a3netfilter: nf_tables: flush pending destroy work before exit_net release | *745cf6a843netfilter: nf_tables: reject new basechain after table flag update | *1c9e71ca61Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped." | *db388b8e12vsock/virtio: fix packet delivery to tap device | *fc77240f63net: usb: ax88179_178a: avoid the interface always configured as random address | *cbaac2e548net/rds: fix possible cp null dereference | *7c1250796bxen-netfront: Add missing skb_mark_for_recycle | *18e189442aBluetooth: Fix TOCTOU in HCI debugfs implementation | *38e3eaa861Bluetooth: hci_event: set the conn encrypted before conn establishes | *3e773d04aeBluetooth: add quirk for broken address properties | *a2812ff7eaBluetooth: qca: fix device-address endianness | *298dc5dd38arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken | *9bf4acc802Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" | *5d920886c3x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word | *3d61f1704br8169: fix issue caused by buggy BIOS on certain boards with RTL8168d | *923579201dKVM: arm64: Fix host-programmed guest events in nVHE | *ad141b08d1perf/x86/amd/lbr: Use freeze based on availability | *8d029111b8x86/cpufeatures: Add new word for scattered features | *58638e3b48dm integrity: fix out-of-range warning | *7d0567842binet: inet_defrag: prevent sk release while still in use | *0642673765Octeontx2-af: fix pause frame configuration in GMP mode | *2553bfaa19net: lan743x: Add set RFE read fifo threshold for PCI1x1x chips | *852698c9fdcifs: Fix duplicate fscache cookie warnings | *98cdac206bbpf: Protect against int overflow for stack access size | *24444af5ddmlxbf_gige: call request_irq() after NAPI initialized | *30fabe50a7tls: get psock ref after taking rxlock to avoid leak | *f52c8f1210tls: adjust recv return with async crypto and failed copy to userspace | *efb4573featls: recv: process_rx_list shouldn't use an offset with kvec | *0e111ce740net: hns3: mark unexcuted loopback test result as UNEXECUTED | *50b69054f4net: hns3: fix kernel crash when devlink reload during pf initialization | *b8b533eeeenet: hns3: fix index limit to support all queue stats | *ebabdae52fACPICA: debugger: check status of acpi_evaluate_object() in acpi_db_walk_for_fields() | *beaf0e7996net: wwan: t7xx: Split 64bit accesses to fix alignment issues | *91b243de91tcp: properly terminate timers for kernel sockets | *16307e7bc1s390/qeth: handle deferred cc1 | *231b189fa1ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa() | *99a75d7500wifi: iwlwifi: mvm: rfi: fix potential response leaks | *57beec623amlxbf_gige: stop PHY during open() error paths | *b51ec7fc9fnfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet | *0336995512dma-buf: Fix NULL pointer dereference in sanitycheck() | *8333aae9bbscripts/bpf_doc: Use silent mode when exec make cmd *7b7c6df465Merge branch 'android14-6.1' into branch 'android14-6.1-lts' *0cf5cecba6Revert "crypto: api - Disallow identical driver names" Change-Id: Iace3d6c28e979288bd5e452ec7513ce23ee300d6 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
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%