mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
45271a2c461a087166eae6cab372db94c4aa0aff
This merges the android14-6.1.141_r00 tag into the android14-6.1 branch, catching it up with the latest LTS releases. It contains the following commits: *18282059e0Revert "espintcp: remove encap socket caching to avoid reference leak" *eb47017bf9Revert "genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie" *22d163151dRevert "perf: Avoid the read if the count is already updated" *f4b979262fRevert "coredump: hand a pidfd to the usermode coredump helper" *f23dc8c566Revert "ipv6: save dontfrag in cork" *b572d7f4f2Revert "serial: mctrl_gpio: split disable_ms into sync and no_sync APIs" *7f0c46ade6Revert "hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING" *ef60b4555dMerge 6.1.141 into android14-6.1-lts |\ | *58485ff1a7Linux 6.1.141 | *0fadcc2043net: ethernet: ti: am65-cpsw: Lower random mac address error print to info | *12fd7e6a2cplatform/x86: thinkpad_acpi: Ignore battery threshold change event notification | *5d286f3cadplatform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys | *dcabad63e0NFS: Avoid flushing data while holding directory locks in nfs_rename() | *e1143267e9nvme-pci: add NVME_QUIRK_NO_DEEPEST_PS quirk for SOLIDIGM P44 Pro | *d8f13a8aefspi: spi-sun4i: fix early activation | *8f55d71b57um: let 'make clean' properly clean underlying SUBARCH as well | *fe4fb4134fplatform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS | *38e8c73f02nfs: don't share pNFS DS connections between net namespaces | *84b06a4293HID: quirks: Add ADATA XPG alpha wireless mouse support | *ac19091288coredump: hand a pidfd to the usermode coredump helper | *b2a5bf1cf4fork: use pidfd_prepare() | *1ced79b25fpid: add pidfd_prepare() | *fc7846a7d5coredump: fix error handling for replace_fd() | *3939280be9perf/arm-cmn: Initialise cmn->cpu earlier | *05b21a536aperf/arm-cmn: Fix REQ2/SNP2 mixup | *a0ec22fa20net_sched: hfsc: Address reentrant enqueue adding class to eltree twice | *a5a9c42cd7arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node | *0297e7ddf5af_unix: Fix uninit-value in __unix_walk_scc() | *c7edc6e616af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS | *28201f38dcaf_unix: Add dead flag to struct scm_fp_list. | *f9977b176faf_unix: Don't access successor in unix_del_edges() during GC. | *951e454715af_unix: Try not to hold unix_gc_lock during accept(). | *61a75360dcaf_unix: Remove lock dance in unix_peek_fds(). | *5dfd283f46af_unix: Replace garbage collection algorithm. | *9734d332efaf_unix: Detect dead SCC. | *61f3d2706caf_unix: Assign a unique index to SCC. | *adfb68b39baf_unix: Avoid Tarjan's algorithm if unnecessary. | *b5b54a3875af_unix: Skip GC if no cycle exists. | *ccbe3d2acaaf_unix: Save O(n) setup of Tarjan's algo. | *edfa4872d0af_unix: Fix up unix_edge.successor for embryo socket. | *12365b707caf_unix: Save listener for embryo socket. | *a6c7ce40eaaf_unix: Detect Strongly Connected Components. | *878df6a069af_unix: Iterate all vertices by DFS. | *5593cb9b1caf_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb. | *f8194e511caf_unix: Link struct unix_edge when queuing skb. | *6b7a036eaaaf_unix: Allocate struct unix_edge for each inflight AF_UNIX fd. | *1002e86c46af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd. | *44aebf50faaf_unix: Remove CONFIG_UNIX_SCM. | *6afc128665af_unix: Remove io_uring code for GC. | *a1ee63f7a0af_unix: Replace BUG_ON() with WARN_ON_ONCE(). | *e9bd632f98af_unix: Try to run GC async. | *ceb8bd6c69af_unix: Run GC on only one CPU. | *7637a75aedaf_unix: Return struct unix_sock from unix_get_socket(). | *63d00b25e0af_unix: Kconfig: make CONFIG_UNIX bool | *36679fab54btrfs: check folio mapping after unlock in relocate_one_folio() | *82ac6adbbbhrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING | *22e3ccf1d5octeontx2-pf: Fix page pool frag allocation warning | *173d9d060cocteontx2-pf: Fix page pool cache index corruption. | *a84f95fecbocteontx2-pf: fix page_pool creation fail for rings > 32k | *bc952bf4e0dmaengine: idxd: Fix passing freed memory in idxd_cdev_open() | *50026aa530x86/mm/init: Handle the special case of device private pages in add_pages(), to not increase max_pfn and trigger dma_addressing_limited() bounce buffers bounce buffers | *bb6e80472ei3c: master: svc: Fix implicit fallthrough in svc_i3c_master_ibi_work() | *79c9df2d7apinctrl: tegra: Fix off by one in tegra_pinctrl_get_group() | *c0c0b03ea1serial: sh-sci: Save and restore more registers | *9502ebf2d2kbuild: Disable -Wdefault-const-init-unsafe | *2c29113154spi: spi-fsl-dspi: Reset SR flags before sending a new message | *8bdaffcdd7spi: spi-fsl-dspi: Halt the module after a new message transfer | *f48dc6849cspi: spi-fsl-dspi: restrict register range for regmap access | *795cea4731ksmbd: fix stream write failure | *4c8d922337Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection" | *b9f7969173mm/page_alloc.c: avoid infinite retries caused by cpuset race | *460664bf8bmemcg: always call cond_resched() after fn() | *9c40d1f7b7Revert "drm/amd: Keep display off while going into S4" | *080da7b2fcsmb: client: Reset all search buffer pointers when releasing buffer | *c8623231e0smb: client: Fix use-after-free in cifs_fill_dirent | *34e2f19e0edrm/edid: fixed the bug that hdr metadata was not reset | *60bd13f8c4platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store() | *836024a6c8llc: fix data loss when reading from a socket in llc_ui_recvmsg() | *eefcc081acALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10 | *f3e14d706eALSA: pcm: Fix race of buffer access at PCM OSS layer | *6d7d458c41can: bcm: add missing rcu read protection for procfs content | *2a437b86accan: bcm: add locking for bcm_op runtime updates | *24ee050bb9can: slcan: allow reception of short error messages | *cceb15864epadata: do not leak refcount in reorder_work | *f0f3d09f53crypto: algif_hash - fix double free in hash_accept | *3cb003b959octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG | *7b1357a108octeontx2-af: Set LMT_ENA bit for APR table entries | *b8fcae6d2enet/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done | *a005991013octeontx2-pf: Add AF_XDP non-zero copy support | *2a2d7bf86docteontx2-pf: Add support for page pool | *f1dde3eb17sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() | *f2138e462cio_uring: fix overflow resched cqe reordering | *8620be38cfnet: lan743x: Restore SGMII CTRL register on resume | *e8138b81d3net: dwmac-sun8i: Use parsed internal PHY address instead of 1 | *b6556470bbice: fix vf->num_mac count with port representors | *2cee71a1a2bridge: netfilter: Fix forwarding of fragmented packets | *15efa7d00fBluetooth: L2CAP: Fix not checking l2cap_chan security level | *7549955105dmaengine: idxd: Fix ->poll() return value | *35e6a84883xfrm: Sanitize marks before insert | *c4bfea4b61clk: sunxi-ng: d1: Add missing divider for MMC mod clocks | *8509fb9decremoteproc: qcom_wcnss: Fix on platforms without fallback regulators | *d19d0157eddmaengine: idxd: Fix allowing write() from different address spaces | *206d8a7b8cdmaengine: idxd: add idxd_copy_cr() to copy user completion record during page fault handling | *22d907d735dmaengine: idxd: add per DSA wq workqueue for processing cr faults | *e4cde54b46espintcp: remove encap socket caching to avoid reference leak | *9b0915e72b__legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock | *a58442f75bxenbus: Allow PVH dom0 a non-local xenstore | *390940c7f3wifi: iwlwifi: add support for Killer on MTL | *0528bba48dbtrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref | *7c0394dbbdio_uring/fdinfo: annotate racy sq/cq head/tail reads | *c240375587nvmet-tcp: don't restore null sk_state_change | *e104460e8aALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx | *9fce40ac35ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013 | *181438633apinctrl: meson: define the pull up/down resistor value as 60 kOhm | *f4ae54bffbASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of() | *ffb55ddf26drm: Add valid clones check | *d822a8e3fbdrm/panel-edp: Add Starry 116KHD024006 | *6a93438018drm/atomic: clarify the rules around drm_atomic_state->allow_modeset | *a78b779206wifi: ath9k: return by of_get_mac_address | *f60d34d4a4regulator: ad5398: Add device tree support | *d97d423ad1spi: zynqmp-gqspi: Always acknowledge interrupts | *8d0c67acdfwifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet | *f4c4d18f72wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate | *60f09a491fwifi: rtl8xxxu: retry firmware download on error | *e7e61e09ceperf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt | *77a7df4b23bpftool: Fix readlink usage in get_fd_type | *658a933038drm/ast: Find VBIOS mode from regular display size | *762535bc37ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode | *08aec29a16HID: usbkbd: Fix the bit shift number for LED_KANA | *3b72b12487scsi: st: Restore some drive settings after reset | *9f9a65de83scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails | *14f8b37e1cscsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine | *31fbeed785net/mana: fix warning in the writer of client oob | *e0d0424a8aice: count combined queues using Rx/Tx count | *e1c3bfe365perf: Avoid the read if the count is already updated | *84916c757crcu: fix header guard for rcu_all_qs() | *e2df1936c1rcu: handle unstable rdp in rcu_read_unlock_strict() | *6090e60428rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y | *77835a04b1r8169: don't scan PHY addresses > 0 | *784b78295avxlan: Annotate FDB data races | *73b9240149media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available | *50b7e3276bhwmon: (xgene-hwmon) use appropriate type for the latency value | *e35875dd2bclk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs | *5338343080wifi: rtw88: Fix download_firmware_validate() for RTL8814AU | *83b5df3df8r8152: add vendor/device ID pair for Dell Alienware AW1022z | *ce534438a8ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). | *81d2a85c65arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src | *6dc0a704f5wifi: mac80211: remove misplaced drv_mgd_complete_tx() call | *9fc9237ffawifi: mac80211: don't unconditionally call drv_mgd_complete_tx() | *5d2af99518net/mlx5e: reduce rep rxq depth to 256 for ECPF | *468255c8ednet/mlx5e: set the tx_queue_len for pfifo_fast | *d525e62f18net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB | *e4f6a56f45drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer() | *9131a4be79drm/amdgpu: enlarge the VBIOS binary size limit | *bc40b6248adrm/amd/display: Initial psr_version with correct setting | *81f4b82cf3drm/amdgpu: reset psp->cmd to NULL after releasing the buffer | *cfdf164ef5phy: core: don't require set_mode() callback for phy_get_mode() to work | *b6e568caafserial: sh-sci: Update the suspend/resume support | *5e3ee618d6clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate | *a6e871c912net/mlx4_core: Avoid impossible mlx4_db_alloc() order value | *0d52c6168dkunit: tool: Use qboot on QEMU x86_64 | *5d08c89c2asmack: recognize ipv4 CIPSO w/o categories | *b23976c6f9pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map | *709b1fb223ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() | *4ffaac5e21ASoC: tas2764: Power up/down amp on mute ops | *ec3a91e22bASoC: tas2764: Mark SW_RESET as volatile | *051f0ee928ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG | *d9f7ac25ffASoC: ops: Enforce platform maximum on initial value | *963bac7f04net/mlx5: Apply rate-limiting to high temperature warning | *89acf46b9enet/mlx5: Modify LSB bitmask in temperature event to include only the first bit | *4d142115a9media: test-drivers: vivid: don't call schedule in loop | *79dbd04fccvxlan: Join / leave MC group after remote changes | *23ecfd5383ACPI: HED: Always initialize before evged | *58fe8fead9PCI: Fix old_size lower bound in calculate_iosize() too | *5f1ecc9aa5eth: mlx4: don't try to complete XDP frames in netpoll | *0d9d54113fcan: c_can: Use of_property_present() to test existence of DT property | *e3c93c7917pmdomain: imx: gpcv2: use proper helper for property detection | *24eb0979ffRDMA/core: Fix best page size finding when it can cross SG entries | *68435c1fa3serial: mctrl_gpio: split disable_ms into sync and no_sync APIs | *74db6edb69i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA) | *07bf524a78EDAC/ie31200: work around false positive build warning | *ef1158a6a6net: pktgen: fix access outside of user given buffer in pktgen_thread_write() | *70a9888018wifi: rtw89: fw: propagate error code from rtw89_h2c_tx() | *3635589fa5wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 | *1c17d07fc4wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU | *100c6e2d0cwifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU | *526ec91398scsi: mpt3sas: Send a diag reset if target reset fails | *790f74d684clocksource: mips-gic-timer: Enable counter when CPUs start | *3972bd4ca5MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core | *e4d3763223genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie | *3394aafdc8MIPS: Use arch specific syscall name match function | *ea4497337fx86/kaslr: Reduce KASLR entropy on most x86 systems | *95d0892433dm: fix unconditional IO throttle caused by REQ_PREFLUSH | *75b01247b4libbpf: Fix out-of-bound read | *01b4545bbcmedia: adv7180: Disable test-pattern control on adv7180 | *a9edb70084cpuidle: menu: Avoid discarding useful information | *60750801cax86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus() | *42733703c4drm/amd/display: handle max_downscale_src_width fail check | *a66f46751cx86/build: Fix broken copy command in genimage.sh when making isoimage | *5f496a9f1csoc: ti: k3-socinfo: Do not use syscon helper to build regmap | *3572663c55bonding: report duplicate MAC address in all situations | *365e617487net: xgene-v2: remove incorrect ACPI_PTR annotation | *62e7868f06net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only | *2272c9d14cleds: pwm-multicolor: Add check for fwnode_property_read_u32 | *c8cc14eeb2drm/amdkfd: KFD release_work possible circular locking | *1964a698cbselftests/net: have `gro.sh -t` return a correct exit code | *866ae3322fnet/mlx5: Avoid report two health errors on same syndrome | *c6aa1d6bd6firmware: arm_ffa: Set dma_mask for ffa devices | *de963561efPCI: brcmstb: Add a softdep to MIP MSI-X driver | *9fe2a6513aPCI: brcmstb: Expand inbound window size up to 64GB | *2d533b62dbsoc: apple: rtkit: Implement OSLog buffers properly | *8d64b2aa3esoc: apple: rtkit: Use high prio work queue | *0c14267f4dfpga: altera-cvp: Increase credit timeout | *31b96c1543drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence | *eeb808ce1eARM: at91: pm: fix at91_suspend_finish for ZQ calibration | *05315e1507hwmon: (gpio-fan) Add missing mutex locks | *594dbf0a19x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2 | *a5df17f35bclk: imx8mp: inform CCF of maximum frequency of clocks | *6782a62c32media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map | *7d49558be0drm/rockchip: vop2: Add uv swap for cluster window | *79f3edb937ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config(). | *f29dd5afa1ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7 | *628ff556e4perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type | *48bd9b9d66net: pktgen: fix mpls maximum labels list parsing | *d1f95fbdf6net: ethernet: ti: cpsw_new: populate netdev of_node | *4473bd0993pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned" | *9d1a5be86dmedia: cx231xx: set device_caps for 417 | *41f654291bdrm/amdgpu: Do not program AGP BAR regs under SRIOV in gfxhub_v1_0.c | *8d0d4c11caremoteproc: qcom_wcnss: Handle platforms with only single power domain | *fdf85aa795net: phylink: use pl->link_interface in phylink_expects_phy() | *15602508adorangefs: Do not truncate file size | *00586b78eedm cache: prevent BUG_ON by blocking retries on failed device resumes | *2996d38f2dmedia: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe() | *b649481a1cARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114 | *fd10aa99efieee802154: ca8210: Use proper setters and getters for bitwise types | *9569e35890rtc: ds1307: stop disabling alarms on probe | *2c86fafda7tcp: bring back NUMA dispersion in inet_ehash_locks_alloc() | *e6ca4d234bALSA: seq: Improve data consistency at polling | *aba0c50463powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 | *806d3ee930arm64: tegra: p2597: Fix gpio for vdd-1v8-dis regulator | *a98bd864e1crypto: lzo - Fix compression buffer overrun | *8917266622cpufreq: tegra186: Share policy per cluster | *239afef07eiommu/amd/pgtbl_v2: Improve error handling | *64e88f718eASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup() | *f306821a7bauxdisplay: charlcd: Partially revert "Move hwidth and bwidth to struct hd44780_common" | *9e5228610fgfs2: Check for empty queue in run_queue | *0b60d03644drm/amd/display: calculate the remain segments for all pipes | *4f809be95dipv6: save dontfrag in cork | *4a8fcd77cehwmon: (dell-smm) Increment the number of fans | *d0306f88b4mmc: sdhci: Disable SD card clock before changing parameters | *03c9ac48aemmc: dw_mmc: add exynos7870 DW MMC support | *5cdb89f76earm64/mm: Check PUD_TYPE_TABLE in pud_bad() | *3bb62cc313netfilter: conntrack: Bound nf_conntrack sysctl writes | *e563401934timer_list: Don't use %pK through printk() | *209f290b4fposix-timers: Add cond_resched() to posix_timer_add() search loop | *8d67953978RDMA/uverbs: Propagate errors from rdma_lookup_get_uobject() | *6944537397ext4: reject the 'data_err=abort' option in nojournal mode | *e472c3d8adASoC: sun4i-codec: support hp-det-gpios property | *7fcfed72a5pinctrl-tegra: Restore SFSEL bit when freeing pins | *02d850de94xen: Add support for XenServer 6.1 platform device | *9af7628ee6net/smc: use the correct ndev to find pnetid by pnetid table | *6d974bd692dm: restrict dm device size to 2^63-512 bytes | *3b5cc6e49ccrypto: octeontx2 - suppress auth failure screaming due to negative tests | *df5a4416c0kbuild: fix argument parsing in scripts/config | *e78a34da61ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect | *669a53eeccthunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer | *7d9682b015rtc: rv3032: fix EERD location | *9ff6d39f17tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() | *a73f1ba994bpf: Return prog btf_id without capable check | *6cd9c9167cvfio/pci: Handle INTx IRQ_NOTCONNECTED | *4c92971bedscsi: st: ERASE does not change tape location | *1f20b8eccfscsi: st: Tighten the page format heuristics with MODE SELECT | *7f778cbffeext4: reorder capability check last | *ea4d9e1a6cum: Update min_low_pfn to match changes in uml_reserved | *f8ddfaab46um: Store full CSGSFS and SS register from mcontext | *75f74c89a8dlm: make tcp still work in multi-link env | *f2985a1de6i3c: master: svc: Fix missing STOP for master request | *227c253c9edrm/amd/display: Guard against setting dispclk low for dcn31x | *822c0e09f4btrfs: send: return -ENAMETOOLONG when attempting a path that is too long | *22bb11b3d5btrfs: get zone unusable bytes while holding lock at btrfs_reclaim_bgs_work() | *e2965d9d21btrfs: fix non-empty delayed iputs list on unmount due to async workers | *013614c23ebtrfs: run btrfs_error_commit_super() early | *2abb4bb795btrfs: avoid linker error in btrfs_find_create_tree_block() | *df4af023f6btrfs: make btrfs_discard_workfn() block_group ref explicit | *e212c8e9f2i2c: pxa: fix call balance of i2c->clk handling routines | *fb6a04c3b7i2c: qup: Vote for interconnect bandwidth to DRAM | *8c18c904d3x86/mm: Check return value from memblock_phys_alloc_range() | *fa73abd359mmc: host: Wait for Vdd to settle on card power off | *db1aef51b8libnvdimm/labels: Fix divide error in nd_label_data_init() | *1671494b71PCI: vmd: Disable MSI remapping bypass under Xen | *5ad8142667pNFS/flexfiles: Report ENETDOWN as a connection error | *1d5786b3batools/build: Don't pass test log files to linker | *1325473abaPCI: dwc: ep: Ensure proper iteration over outbound map windows | *1fdd7255d5objtool: Properly disable uaccess validation | *2896063907lockdep: Fix wait context check on softirq for PREEMPT_RT | *2d905fdb7fdql: Fix dql->limit value when reset. | *33aaf2e4d3thermal/drivers/qoriq: Power down TMU on system suspend | *61ce7181fbSUNRPC: rpcbind should never reset the port to the value '0' | *18dd5c41f6SUNRPC: rpc_clnt_set_transport() must not change the autobind setting | *b11ffd1dc3NFSv4: Treat ENETUNREACH errors as fatal for state recovery | *8e93857d8dcifs: Fix establishing NetBIOS session for SMB2+ connection | *96106d4f3ffbdev: core: tileblit: Implement missing margin clearing for tileblit | *57aa1e8197fbcon: Use correct erase colour for clearing in fbcon | *af6e4ccb08fbdev: fsl-diu-fb: add missing device_remove_file() | *d8aea4921fmailbox: use error ret code of of_parse_phandle_with_args() | *6707f9749dtracing: Mark binary printing functions with __printf() attribute | *cdfe09355carm64: Add support for HIP09 Spectre-BHB mitigation | *0b99bcbd62SUNRPC: Don't allow waiting for exiting tasks | *2bd25a7916NFS: Don't allow waiting for exiting tasks | *429d487d94NFSv4: Check for delegation validity in nfs_start_delegation_return_locked() | *f706cb4e37fuse: Return EPERM rather than ENOSYS from link() | *b413cf7ff5cifs: Fix negotiate retry functionality | *5d736eee3ccifs: Fix querying and creating MF symlinks over SMB1 | *17e53a15e6cifs: Add fallback for SMB2 CREATE without FILE_READ_ATTRIBUTES | *8696f0e4f6s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log | *53dd81d7bakconfig: merge_config: use an empty file as initfile | *aa8687470asamples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora | *0953353269bpf: fix possible endless loop in BPF map iteration | *5f3d693861selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure | *f238c9c15ddrm/amdgpu: Allow P2P access through XGMI | *4964646234net: enetc: refactor bulk flipping of RX buffers to separate function | *1d44f1511bscsi: mpi3mr: Add level check to control event logging | *91fe35809ecgroup: Fix compilation issue due to cgroup_mutex not being exported | *04aa1f6d16dma-mapping: avoid potential unused data compilation warning | *b6d6419548virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN | *6815846e0cscsi: target: iscsi: Fix timeout on deleted connection | *ee963a9847phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off | *a640e906d9phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data | *6dbb6f00dcphy: renesas: rcar-gen3-usb2: Move IRQ request in probe | *ba7694f61cphy: renesas: rcar-gen3-usb2: Add support to initialize the bus | *262e32568agpio: pca953x: fix IRQ storm on system wake up | *aa34c055d3gpio: pca953x: Simplify code with cleanup helpers | *af7488d114gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context() | *59047be46cgpio: pca953x: Add missing header(s) * |deadfd1486Merge android14-6.1 into android14-6.1-lts * |f4843e14bfMerge 6.1.140 into android14-6.1-lts |\| | *da3c5173c5Linux 6.1.140 | *05e85d3767x86/modules: Set VM_FLUSH_RESET_PERMS in module_alloc() | *4e6310e8d4drm/amdgpu: fix pm notifier handling | *2c914aac95spi: cadence-qspi: fix pointer reference in runtime PM hooks | *55bf541e01ipv4: Fix uninit-value access in __ip_make_skb() | *a05c1ede50ipv6: Fix potential uninit-value access in __ip6_make_skb() | *b7fd784d7cbnxt_en: Fix receive ring space parameters when XDP is active | *ab47d72b73platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it | *f6421555dbarm64/sme: Always exit sme_alloc() early with existing storage | *b0f013bebfnetfilter: nf_tables: do not defer rule destruction via call_rcu | *e6c32a64d6netfilter: nf_tables: wait for rcu grace period on net_device removal | *bbd68196acnetfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx | *18eb53a273btrfs: don't BUG_ON() when 0 reference count at btrfs_lookup_extent_info() | *386507cb6fsctp: add mutual exclusion in proc_sctp_do_udp_port() | *3926b572fdhwpoison, memory_hotplug: lock folio before unmap hwpoisoned folio | *091a7f20d5LoongArch: Explicitly specify code model in Makefile | *9e80f366ebbpf, arm64: Fix address emission with tag-based KASAN enabled | *0771494784bpf, arm64: Fix trampoline for BPF_TRAMP_F_CALL_ORIG | *92f08673d3riscv: mm: Fix the out of bound issue of vmemmap address | *e5ec1c24e7mm/vmscan: fix a bug calling wakeup_kswapd() with a wrong zone index | *09b18c2435selftests/mm: compaction_test: support platform with huge mount of memory | *0529646acdusb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control() | *e44189455cusb: typec: fix potential array underflow in ucsi_ccg_sync_control() | *f1c5ddaef5usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group | *f32451ca4cusb: typec: ucsi: displayport: Fix deadlock | *d8ef6140fedmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe | *64afd9a1f6dmaengine: idxd: fix memory leak in error handling path of idxd_alloc | *68ac5a01f6dmaengine: idxd: Add missing idxd cleanup to fix memory leak in remove call | *24d9c14fdcdmaengine: idxd: Add missing cleanups in cleanup internals | *9b4947544bdmaengine: idxd: Add missing cleanup for early error out in idxd_setup_internals | *50f2300178dmaengine: idxd: fix memory leak in error handling path of idxd_setup_groups | *11fd63ea08dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines | *d584acdf54dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs | *c70ec7dc88dmaengine: ti: k3-udma: Use cap_mask directly from dma_device structure instead of a local copy | *df5987e76admaengine: ti: k3-udma: Add missing locking | *8e460b77b7net: qede: Initialize qede_ll_ops with designated initializer | *b892e830d1wifi: mt76: disable napi on driver removal | *e424894340smb: client: fix memory leak during error handling for POSIX mkdir | *d5b4310993scsi: sd_zbc: block: Respect bio vector limits for REPORT ZONES buffer | *4861b3d2a4phy: renesas: rcar-gen3-usb2: Set timing registers only once | *9b85a453eaphy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind | *f774628bc1phy: Fix error handling in tegra_xusb_port_init | *12ba469abetracing: samples: Initialize trace_array_printk() with the correct function | *cbe20c2c83ftrace: Fix preemption accounting for stacktrace filter command | *c4edc834d2ftrace: Fix preemption accounting for stacktrace trigger command | *763db1b8b0Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer() | *6ef4c72213Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges | *b47a984fafhv_netvsc: Remove rmsg_pgcnt | *86b05e14c4hv_netvsc: Preserve contiguous PFN grouping in the page buffer array | *3e5210def3hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages | *3becc659f9dma-buf: insert memory barrier before updating num_fences | *01dfc57326ALSA: usb-audio: Add sample rate quirk for Microdia JP001 USB Camera | *7ba07e109fALSA: usb-audio: Add sample rate quirk for Audioengine D1 | *f5abc1344fALSA: es1968: Add error handling for snd_pcm_hw_constraint_pow2() | *b71a04bae2ACPI: PPTT: Fix processor subtable walk | *0638bad18ddrm/amd/display: Avoid flooding unnecessary info messages | *d9632f4aaedrm/amd/display: Correct the reply value when AUX write incomplete | *0f035835b4btrfs: fix discard worker infinite loop after disabling discard | *0567e7951fLoongArch: Fix MAX_REG_OFFSET calculation | *02a11d8638dmaengine: Revert "dmaengine: dmatest: Fix dmatest waiting less when interrupted" | *8f2eb3adb3NFSv4/pnfs: Reset the layout state after a layoutreturn | *8f7f96549bnet/tls: fix kernel panic when alloc_page failed | *2c09d6460focteontx2-pf: macsec: Fix incorrect max transmit size in TX secy | *6ba30f7aa2regulator: max20086: fix invalid memory access | *10ea81e478qlcnic: fix memory leak in qlcnic_sriov_channel_cfg_cmd() | *1e577aeb51net/mlx5e: Disable MACsec offload for uplink representor profile | *6fbcfa3691ALSA: sh: SND_AICA should depend on SH_DMA_API | *9609469159nvme-pci: acquire cq_poll_lock in nvme_poll_irqdisable | *6fc167d45fnvme-pci: make nvme_pci_npages_prp() __always_inline | *4626234ca3net: dsa: sja1105: discard incoming frames in BR_STATE_LISTENING | *aace6b6389net: cadence: macb: Fix a possible deadlock in macb_halt_tx. | *1cb9a891cfnet: mctp: Ensure keys maintain only one ref to corresponding dev | *d38939ebe0net_sched: Flush gso_skb list too during ->change() | *915c3de392spi: loopback-test: Do not split 1024-byte hexdumps | *85fb7f8ca5nfs: handle failure of nfs_get_lock_context in unlock path | *01b76cc8caHID: uclogic: Add NULL check in uclogic_input_configured() | *de9b6d0635HID: thrustmaster: fix memory leak in thrustmaster_interrupts() | *52daccfc3fRDMA/rxe: Fix slab-use-after-free Read in rxe_queue_cleanup bug | *718df14948clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable() | *c4a550e0baiio: chemical: sps30: use aligned_s64 for timestamp | *39d30f8ecciio: adc: ad7768-1: Fix insufficient alignment of timestamp. | *ced7c789e3Revert "drm/amd: Stop evicting resources on APUs in suspend" | *a2419fa7fedrm/amd: Add Suspend/Hibernate notification callback support | *43b8b33b81drm/amdgpu: trigger flr_work if reading pf2vf data failed | *c3408b49e3drm/amdgpu: Fix the runtime resume failure issue | *6b9418c825drm/amd: Stop evicting resources on APUs in suspend | *d7b0db1246iio: adc: ad7266: Fix potential timestamp alignment issue. | *22bed5bd0dtpm: tis: Double the timeout B to 4s | *2f81039276tracing: probes: Fix a possible race in trace_probe_log APIs | *5eadacf806platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection | *44f3f92053binfmt_elf: Move brk for static PIE even if ASLR disabled | *af66f1d950binfmt_elf: Honor PT_LOAD alignment for static PIE | *2fb38e1a01binfmt_elf: Calculate total_size earlier | *add3a49ae9selftests/exec: Build both static and non-static load_address tests | *7a60eba05abinfmt_elf: Leave a gap between .bss and brk | *fea22a3e06selftests/exec: load_address: conform test to TAP format output | *1707053766binfmt_elf: elf_bss no longer used by load_elf_binary() | *86811e8778binfmt_elf: Support segments with 0 filesz and misaligned starts | *e20878d4ebbinfmt: Fix whitespace issues * |d2136f8626Merge 6.1.139 into android14-6.1-lts |/ *325285d9fcLinux 6.1.139 *69afd82670x86/its: FineIBT-paranoid vs ITS *73c71762fex86/alternatives: Remove faulty optimization *7e00c01ff8x86/alternative: Optimize returns patching *c2bece04bax86/its: Fix build errors when CONFIG_MODULES=n *959cadf09dx86/its: Use dynamic thunks for indirect branches *9502e83c22x86/ibt: Keep IBT disabled during alternative patching *e6da4a83e3x86/its: Align RETs in BHB clear sequence to avoid thunking *139c0b8318x86/its: Add "vmexit" option to skip mitigation on some CPUs *b1701fee52x86/its: Enable Indirect Target Selection mitigation *dbd8f170afx86/its: Add support for ITS-safe return thunk *5e7d4f2acex86/its: Add support for ITS-safe indirect thunk *0eda20c29ex86/its: Enumerate Indirect Target Selection (ITS) bug *ed2e894a76Documentation: x86/bugs/its: Add ITS documentation *b1ef84b0ffx86/speculation: Remove the extra #ifdef around CALL_NOSPEC *fb3768004ex86/speculation: Add a conditional CS prefix to CALL_NOSPEC *4bc1033dffx86/speculation: Simplify and make CALL_NOSPEC consistent *db734ba733x86/bhi: Do not set BHI_DIS_S in 32-bit mode *cebc238b02x86/bpf: Add IBHF call at end of classic BPF *845c707b80x86/bpf: Call branch history clearing sequence on exit *9fc1391552arm64: proton-pack: Add new CPUs 'k' values for branch mitigation *6e52d043f7arm64: bpf: Only mitigate cBPF programs loaded by unprivileged users *8fe5c37b0earm64: bpf: Add BHB mitigation to the epilogue for cBPF programs *4977712341arm64: proton-pack: Expose whether the branchy loop k value *351a505eb4arm64: proton-pack: Expose whether the platform is mitigated by firmware *cc0b8e148carm64: insn: Add support for encoding DSB *361dfa7f5cRevert "net: phy: microchip: force IRQ polling mode for lan88xx" *b82c386898io_uring: ensure deferred completions are posted for multishot *95b9acb0bbio_uring: always arm linked timeouts prior to issue *0e42a14899do_umount(): add missing barrier before refcount checks in sync case *8642cbf11envme: unblock ctrl state transition for firmware update *bd68de433fdrm/panel: simple: Update timings for AUO G101EVN010 *d189b461d5MIPS: Fix MAX_REG_OFFSET *ea25ee0bb4iio: adc: dln2: Use aligned_s64 for timestamp *b6c984f4ebiio: accel: adxl355: Make timestamp 64-bit aligned using aligned_s64 *8f0064eb22types: Complement the aligned types with signed 64-bit one *35061dc5f6iio: temp: maxim-thermocouple: Fix potential lack of DMA safe buffer. *6f371b751biio: accel: adxl367: fix setting odr for activity time update *7591a2e6c0usb: usbtmc: Fix erroneous generic_read ioctl return *5f72912d35usb: usbtmc: Fix erroneous wait_srq ioctl return *a647d960fbusb: usbtmc: Fix erroneous get_stb ioctl error returns *1956c3d878USB: usbtmc: use interruptible sleep in usbtmc_read *076ab0631eusb: typec: ucsi: displayport: Fix NULL pointer access *2e89025609usb: typec: tcpm: delay SNK_TRY_WAIT_DEBOUNCE to SRC_TRYWAIT transition *7d6224d1cfusb: host: tegra: Prevent host controller crash when OTG port is used *6fe2677bcfusb: gadget: tegra-xudc: ACK ST_RC after clearing CTRL_RUN *ee51a5d322usb: cdnsp: fix L1 resume issue for RTL_REVISION_NEW_LPM version *0554dade57usb: cdnsp: Fix issue with resuming from L1 *4c3a0b0b23ocfs2: stop quota recovery before disabling quotas *6e5c3d9f29ocfs2: implement handshaking with ocfs2 recovery thread *c77a473d6eocfs2: switch osb->disable_recovery to enum *9e7b49ce4fmodule: ensure that kobject_put() is safe for module type kobjects *8b02f85e84xenbus: Use kref to track req lifetime *cf61669c50usb: uhci-platform: Make the clock really optional *b04cfc229adrm/amdgpu/hdp5.2: use memcfg register to post the write for HDP flush *470f56fc35drm/amd/display: Copy AUX read reply data whenever length > 0 *9e83c84de3drm/amd/display: Fix wrong handling for AUX_DEFER case *2cca631283drm/amd/display: Remove incorrect checking in dmub aux handler *f3385a056adrm/amd/display: Fix the checking condition in dmub aux handling *5235b56b7edrm/v3d: Add job to pending list if the reset was skipped *16857370b3iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_tagged_fifo *6c4a500061iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo *2c66239cbfiio: adis16201: Correct inclinometer channel resolution *06acabd59biio: adc: ad7606: fix serial register access *30a4efc067drm/amd/display: Shift DMUB AUX reply command if necessary *02ad4ce144x86/mm: Eliminate window where TLB flushes may be inadvertently skipped *651d9b7d47staging: axis-fifo: Correct handling of tx_fifo_depth for size validation *0a73a6ac5fstaging: axis-fifo: Remove hardware resets for user errors *0f2c03bc1dstaging: iio: adc: ad7816: Correct conditional logic for store mode *a92a9a4a33Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5 *4e904ea41fInput: synaptics - enable SMBus for HP Elitebook 850 G1 *7905a5fd76Input: synaptics - enable InterTouch on Dell Precision M3800 *ed506876c5Input: synaptics - enable InterTouch on Dynabook Portege X30L-G *f69db59eecInput: synaptics - enable InterTouch on Dynabook Portege X30-D *334d74a798Input: mtk-pmic-keys - fix possible null pointer dereference *03d71e1b24net: dsa: b53: fix learning on VLAN unaware bridges *3379b3ca2cnet: dsa: b53: always rejoin default untagged VLAN on bridge leave *4dc610122cnet: dsa: b53: fix VLAN ID for untagged vlan on bridge leave *55c845e76fnet: dsa: b53: fix flushing old pvid VLAN on pvid change *7f622ae738net: dsa: b53: fix clearing PVID of a port *aad87c94benet: dsa: b53: allow leaky reserved multicast *de1067cc8cbpf: Scrub packet on bpf_redirect_peer *aa77294b0fnetfilter: ipset: fix region locking in hash types *7d0032112aipvs: fix uninit-value for saddr in do_output_route4 *6e67f25c11ipv4: Drop tos parameter from flowi4_update_output() *21988c712acan: gw: fix RCU/BH usage in cgw_create_job() *3df065841crcu/kvfree: Add kvfree_rcu_mightsleep() and kfree_rcu_mightsleep() *e50ee08fafcan: mcp251xfd: fix TDC setting for low data bit rates *a51dc9669fgre: Fix again IPv6 link-local address generation. *c928dd4f6bsch_htb: make htb_deactivate() idempotent *facf22c1a3ksmbd: fix memory leak in parse_lease_state() *bca8df998copenvswitch: Fix unsafe attribute parsing in output_userspace() *7f61da79dfksmbd: prevent out-of-bounds stream writes by validating *pos *7fbb439ee2can: mcp251xfd: mcp251xfd_remove(): fix order of unregistration calls *0de5d055d4can: mcan: m_can_class_unregister(): fix order of unregistration calls *9f9d1ddee8arm64: dts: imx8mm-verdin: Link reg_usdhc2_vqmmc to usdhc2 *b173204aaddm: add missing unlock on in dm_keyslot_evict() Change-Id: Ibf2bcf5be1d871f03b6b19cd8bd8d1c3cd240fa5 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%