No description
  • C 98.2%
  • Assembly 1%
  • Makefile 0.3%
  • Shell 0.2%
  • Python 0.1%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Greg Kroah-Hartman 3d01868604 Merge tag 'android11-5.4.294_r00' into android11-5.4
This merges the android11-5.4.294_r00 tag into the android11-5.4 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* 027c685e9c Revert "coredump: hand a pidfd to the usermode coredump helper"
*   cd881391f1 Merge 5.4.294 into android11-5.4-lts
|\
| * 44613a259d Linux 5.4.294
| * c3ccbd8625 xen/swiotlb: relax alignment requirements
| * 9fe7b08043 platform/x86: thinkpad_acpi: Ignore battery threshold change event notification
| * 7614a710a6 platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys
| * acfc86d988 spi: spi-sun4i: fix early activation
| * dd1283d756 um: let 'make clean' properly clean underlying SUBARCH as well
| * e0dad9d0a3 platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS
| * c04f5dc4c3 nfs: don't share pNFS DS connections between net namespaces
| * f993c18258 HID: quirks: Add ADATA XPG alpha wireless mouse support
| * 79bf58c7c4 coredump: hand a pidfd to the usermode coredump helper
| * 607ff004cb fork: use pidfd_prepare()
| * 0a841d0a48 pid: add pidfd_prepare()
| * 53df781e0b pidfd: check pid has attached task in fdinfo
| * d4dfdd5081 coredump: fix error handling for replace_fd()
| * e5bee633cc net_sched: hfsc: Address reentrant enqueue adding class to eltree twice
| * 9f5748b694 smb: client: Reset all search buffer pointers when releasing buffer
| * aee067e88d smb: client: Fix use-after-free in cifs_fill_dirent
| * 80cf7ecf36 drm/i915/gvt: fix unterminated-string-initialization warning
| * 5146c27b27 netfilter: nf_tables: do not defer rule destruction via call_rcu
| * 9eee6097ff netfilter: nf_tables: wait for rcu grace period on net_device removal
| * 791332ecb5 netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx
| * 86a8bec7cc kbuild: Disable -Wdefault-const-init-unsafe
| * 5b2f7f0424 spi: spi-fsl-dspi: restrict register range for regmap access
| * 251bfa6997 mm/page_alloc.c: avoid infinite retries caused by cpuset race
| * 25b5d466a9 memcg: always call cond_resched() after fn()
| * c603209c47 drm/edid: fixed the bug that hdr metadata was not reset
| * 7ff230d853 llc: fix data loss when reading from a socket in llc_ui_recvmsg()
| * c0e05a76fc ALSA: pcm: Fix race of buffer access at PCM OSS layer
| * 19f553a1dd can: bcm: add missing rcu read protection for procfs content
| * 8f1c022541 can: bcm: add locking for bcm_op runtime updates
| * 5bff312b59 crypto: algif_hash - fix double free in hash_accept
| * 1034e33107 sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()
| * 617fbcc146 net: dwmac-sun8i: Use parsed internal PHY address instead of 1
| * 6a31da4a66 bridge: netfilter: Fix forwarding of fragmented packets
| * 86df072c74 xfrm: Sanitize marks before insert
| * 628fb00195 __legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock
| * 511c134b06 xenbus: Allow PVH dom0 a non-local xenstore
| * 5755b67316 btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref
| * 6265538446 nvmet-tcp: don't restore null sk_state_change
| * c16d062b32 ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013
| * 381803dc84 pinctrl: meson: define the pull up/down resistor value as 60 kOhm
| * cf1e0fb9b7 drm: Add valid clones check
| * 7058969832 drm/atomic: clarify the rules around drm_atomic_state->allow_modeset
| * c413172da0 regulator: ad5398: Add device tree support
| * 28780cb5dd wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate
| * 8079ba2843 bpftool: Fix readlink usage in get_fd_type
| * 2d16514e55 HID: usbkbd: Fix the bit shift number for LED_KANA
| * 95afb4afbb scsi: st: Restore some drive settings after reset
| * 82f3c2e2a4 scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine
| * 55fbc3c002 rcu: fix header guard for rcu_all_qs()
| * be6ab68820 rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y
| * 02a33b1035 vxlan: Annotate FDB data races
| * c4e068ad25 hwmon: (xgene-hwmon) use appropriate type for the latency value
| * 7d024eea97 ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
| * 683b76fc9b net/mlx5e: reduce rep rxq depth to 256 for ECPF
| * 7df118ff51 net/mlx5e: set the tx_queue_len for pfifo_fast
| * c6406c5942 net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB
| * 3cd53e516f phy: core: don't require set_mode() callback for phy_get_mode() to work
| * ebe4325f2b net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
| * 99d862c931 smack: recognize ipv4 CIPSO w/o categories
| * a0c653ad63 pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map
| * 5a443be4ee ASoC: ops: Enforce platform maximum on initial value
| * a8cb81bfff net/mlx5: Apply rate-limiting to high temperature warning
| * 175d63d907 net/mlx5: Modify LSB bitmask in temperature event to include only the first bit
| * 03eefaed85 ACPI: HED: Always initialize before evged
| * 0f0670b3b5 PCI: Fix old_size lower bound in calculate_iosize() too
| * e3f840799d EDAC/ie31200: work around false positive build warning
| * a3d89f1cfe net: pktgen: fix access outside of user given buffer in pktgen_thread_write()
| * 94e48d31fe wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU
| * 4e03d06f7a scsi: mpt3sas: Send a diag reset if target reset fails
| * f188d186f9 MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core
| * bc7e356d56 MIPS: Use arch specific syscall name match function
| * c11cae64e0 cpuidle: menu: Avoid discarding useful information
| * 69f7d801d8 x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus()
| * 611fba29bf bonding: report duplicate MAC address in all situations
| * d5dbfdf849 net: xgene-v2: remove incorrect ACPI_PTR annotation
| * 0b2cb9ea6b drm/amdkfd: KFD release_work possible circular locking
| * d47d8e0090 net/mlx5: Avoid report two health errors on same syndrome
| * dace567805 fpga: altera-cvp: Increase credit timeout
| * 7725d40b51 drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence
| * fdd98facb1 hwmon: (gpio-fan) Add missing mutex locks
| * a8c22ec36c x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2
| * cb071c4d7a net: pktgen: fix mpls maximum labels list parsing
| * ef95c6b303 pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned"
| * 2ad41beb7d media: cx231xx: set device_caps for 417
| * ceaf195ed2 orangefs: Do not truncate file size
| * c614584c2a dm cache: prevent BUG_ON by blocking retries on failed device resumes
| * 33cc26204e media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe()
| * b468b0d85f ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114
| * 0819729b65 ieee802154: ca8210: Use proper setters and getters for bitwise types
| * cadb64fea4 rtc: ds1307: stop disabling alarms on probe
| * 14e8c9c050 powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7
| * 4bab7a55ac mmc: sdhci: Disable SD card clock before changing parameters
| * 5972d854cd netfilter: conntrack: Bound nf_conntrack sysctl writes
| * 322e82c50a posix-timers: Add cond_resched() to posix_timer_add() search loop
| * baedd1ef92 xen: Add support for XenServer 6.1 platform device
| * 8a63c8d9c6 dm: restrict dm device size to 2^63-512 bytes
| * ac7d620cad kbuild: fix argument parsing in scripts/config
| * 47d75cd6b3 scsi: st: ERASE does not change tape location
| * d885df76e7 scsi: st: Tighten the page format heuristics with MODE SELECT
| * 3fc269dcc0 ext4: reorder capability check last
| * 874553032a um: Update min_low_pfn to match changes in uml_reserved
| * ba38e64634 um: Store full CSGSFS and SS register from mcontext
| * b8f420a5b1 btrfs: send: return -ENAMETOOLONG when attempting a path that is too long
| * 9afb72df66 btrfs: avoid linker error in btrfs_find_create_tree_block()
| * 1fb065f237 i2c: pxa: fix call balance of i2c->clk handling routines
| * 65845b2f1d mmc: host: Wait for Vdd to settle on card power off
| * 2bd4a938d2 libnvdimm/labels: Fix divide error in nd_label_data_init()
| * 995c72683c pNFS/flexfiles: Report ENETDOWN as a connection error
| * cf7c3d7e87 tools/build: Don't pass test log files to linker
| * fa1cd3213e dql: Fix dql->limit value when reset.
| * 0f0fdd5a75 SUNRPC: rpc_clnt_set_transport() must not change the autobind setting
| * c30bc4d291 NFSv4: Treat ENETUNREACH errors as fatal for state recovery
| * b940374cf8 fbdev: core: tileblit: Implement missing margin clearing for tileblit
| * e9eb6288a4 fbdev: fsl-diu-fb: add missing device_remove_file()
| * f60ba8bd27 mailbox: use error ret code of of_parse_phandle_with_args()
| * 94a78c618e kconfig: merge_config: use an empty file as initfile
| * 973841022d cgroup: Fix compilation issue due to cgroup_mutex not being exported
| * c668e30528 dma-mapping: avoid potential unused data compilation warning
| * 571ce6b6f5 scsi: target: iscsi: Fix timeout on deleted connection
| * 6712dc2150 openvswitch: Fix unsafe attribute parsing in output_userspace()
| * 2e765124c2 Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5
| * 2e45aaa4aa Input: synaptics - enable SMBus for HP Elitebook 850 G1
| * 0ebb19c657 clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable()
| * 2007f9dc73 phy: renesas: rcar-gen3-usb2: Set timing registers only once
| * 01bd47af24 phy: Fix error handling in tegra_xusb_port_init
| * 1f73ccc674 ALSA: es1968: Add error handling for snd_pcm_hw_constraint_pow2()
| * b8ee9fe570 ACPI: PPTT: Fix processor subtable walk
| * aeed6418c4 dmaengine: Revert "dmaengine: dmatest: Fix dmatest waiting less when interrupted"
| * eb04621218 NFSv4/pnfs: Reset the layout state after a layoutreturn
| * 1057c7ae8b NFSv4/pnfs: pnfs_set_layout_stateid() should update the layout cred
| * 7f42126b61 qlcnic: fix memory leak in qlcnic_sriov_channel_cfg_cmd()
| * 8887470ae1 ALSA: sh: SND_AICA should depend on SH_DMA_API
| * 7d2bbcf834 net: dsa: sja1105: discard incoming frames in BR_STATE_LISTENING
| * b383443f20 spi: loopback-test: Do not split 1024-byte hexdumps
| * db6f5ee1fc nfs: handle failure of nfs_get_lock_context in unlock path
| * 7c7c80c32e RDMA/rxe: Fix slab-use-after-free Read in rxe_queue_cleanup bug
| * df6fbd8380 iio: chemical: sps30: use aligned_s64 for timestamp
| * d04c98d2c8 iio: adc: ad7768-1: Fix insufficient alignment of timestamp.
| * 4ec0ce14c3 staging: axis-fifo: Correct handling of tx_fifo_depth for size validation
| * 51d31e083a staging: axis-fifo: avoid parsing ignored device tree properties
| * 5afeeda4f3 staging: axis-fifo: Remove hardware resets for user errors
| * 7570ce5bdd staging: axis-fifo: replace spinlock with mutex
| * af2fa177ed platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection
| * 80a00ec057 do_umount(): add missing barrier before refcount checks in sync case
| * 746723dfea nvme: unblock ctrl state transition for firmware update
| * c775b024d0 MIPS: Fix MAX_REG_OFFSET
| * a1907a724c iio: adc: dln2: Use aligned_s64 for timestamp
| * 183b10e904 types: Complement the aligned types with signed 64-bit one
| * 4f72a8dc6f usb: usbtmc: Fix erroneous generic_read ioctl return
| * 85934459bc usb: usbtmc: Fix erroneous wait_srq ioctl return
| * 8d9a5eaeed usb: usbtmc: Fix erroneous get_stb ioctl error returns
| * 388842c35d USB: usbtmc: use interruptible sleep in usbtmc_read
| * 9dda1e2a66 usb: typec: ucsi: displayport: Fix NULL pointer access
| * 64d5ed26bf usb: typec: tcpm: delay SNK_TRY_WAIT_DEBOUNCE to SRC_TRYWAIT transition
| * 073a7db01d ocfs2: stop quota recovery before disabling quotas
| * ca68863a96 ocfs2: implement handshaking with ocfs2 recovery thread
| * 58b6a818ba ocfs2: switch osb->disable_recovery to enum
| * 93799fb988 module: ensure that kobject_put() is safe for module type kobjects
| * 0e94a246bb xenbus: Use kref to track req lifetime
| * 30a7a79360 usb: uhci-platform: Make the clock really optional
| * 4db7d923a8 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_tagged_fifo
| * f06a1a1954 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo
| * 759f844d68 iio: adis16201: Correct inclinometer channel resolution
| * 196d4c5d4b iio: adc: ad7606: fix serial register access
| * 7ff32a515e staging: iio: adc: ad7816: Correct conditional logic for store mode
| * 7c5a9ce503 Input: synaptics - enable InterTouch on Dell Precision M3800
| * ecf55804d8 Input: synaptics - enable InterTouch on Dynabook Portege X30L-G
| * daec2f4557 Input: synaptics - enable InterTouch on Dynabook Portege X30-D
| * dfae1fe8f5 net: dsa: b53: fix learning on VLAN unaware bridges
| * 00cfc5fad1 netfilter: ipset: fix region locking in hash types
| * 99ff8a20fd sch_htb: make htb_deactivate() idempotent
| * 54e57be257 scsi: target: Fix WRITE_SAME No Data Buffer crash
| * d184c65481 dm: fix copying after src array boundaries
| * 2b65060c84 iommu/amd: Fix potential buffer overflow in parse_ivrs_acpihid
| * 50c061c600 arm64: dts: rockchip: fix iface clock-name on px30 iommus
| * d086cca921 usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
| * b8feb22ee5 usb: chipidea: ci_hdrc_imx: use dev_err_probe()
| * 33f2c60835 usb: chipidea: imx: refine the error handling for hsic
| * 8604f11114 usb: chipidea: imx: change hsic power regulator as optional
| * 0c241dedc4 irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
| * 2fd802e0a9 irqchip/gic-v2m: Mark a few functions __init
| * 7c7d142bc9 irqchip/gic-v2m: Add const to of_device_id
| * e6b45f4de7 sch_htb: make htb_qlen_notify() idempotent
| * 46795440ef of: module: add buffer overflow check in of_modalias()
| * 844ae02c78 PCI: imx6: Skip controller_id generation logic for i.MX7D
| * b1d8631216 net: fec: ERR007885 Workaround for conventional TX
| * 093855ce90 net: lan743x: Fix memleak issue when GSO enabled
| * 9e08de595b lan743x: fix endianness when accessing descriptors
| * a63d220f2a lan743x: remove redundant initialization of variable current_head_index
| * 38c10733ae nvme-tcp: fix premature queue removal and I/O failover
| * 2fb48a0fd1 net: dlink: Correct endianness handling of led_mode
| * 041f410aec net_sched: qfq: Fix double list add in class with netem as child qdisc
| * 273bbcfa53 net_sched: hfsc: Fix a UAF vulnerability in class with netem as child qdisc
| * 5da3aad1a1 net_sched: drr: Fix double list add in class with netem as child qdisc
| * 505f562646 net/mlx5: E-Switch, Initialize MAC Address for Default GID
| * f4b0174e9f tracing: Fix oob write in trace_seq_to_buffer()
| * f4f23b2f2b dm: always update the array size in realloc_argv on success
| * 4673500fc1 dm-integrity: fix a warning on invalid table line
| * 972bf75e53 wifi: brcm80211: fmac: Add error handling for brcmf_usb_dl_writeimage()
| * e5b3c827cd amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload
| * 2a1aff3616 parisc: Fix double SIGFPE crash
| * a4e8f24422 i2c: imx-lpi2c: Fix clock count when probe defers
| * 48e5a0d265 EDAC/altera: Set DDR and SDMMC interrupt mask before registration
| * 796149df6c EDAC/altera: Test the correct error reg offset
* 8782a46e4f Merge android11-5.4 into android11-5.4-lts
* a38a5caa68 Merge 5.4.293 into android11-5.4-lts
* 9003e46d17 Merge branch 'android11-5.4' into android11-5.4-lts

Change-Id: I29ab69a194e178250e8138d0093a6e81826e3ae9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-06-16 05:13:58 +00:00
android ANDROID: ABI: Cuttlefish Symbol update 2025-02-18 01:00:45 -08:00
arch This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
block This is the 5.4.292 stable release 2025-04-11 08:16:05 +00:00
certs
crypto This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
Documentation This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
drivers Merge tag 'android11-5.4.294_r00' into android11-5.4 2025-06-16 05:13:58 +00:00
fs Revert "coredump: hand a pidfd to the usermode coredump helper" 2025-06-05 07:57:32 +00:00
include Revert "coredump: hand a pidfd to the usermode coredump helper" 2025-06-05 07:57:32 +00:00
init Merge tag 'android11-5.4.293_r00' into android11-5.4 2025-05-26 03:40:18 -07:00
ipc ipc: replace costly bailout check in sysvipc_find_ipc() 2024-09-04 13:15:02 +02:00
kernel This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
lib This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
LICENSES
mm This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
net This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
samples Merge 5.4.287 into android11-5.4-lts 2024-12-16 10:50:16 +00:00
scripts This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
security This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
sound This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
tools This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
usr
virt KVM: arm64: Ignore PMCNTENSET_EL0 while checking for overflow status 2024-12-19 18:05:04 +01:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore Remove *.orig pattern from .gitignore 2024-11-08 16:20:33 +01:00
.mailmap
build.config.aarch64
build.config.allmodconfig
build.config.allmodconfig.aarch64
build.config.allmodconfig.arm
build.config.allmodconfig.x86_64
build.config.arm
build.config.common
build.config.db845c ANDROID: db845c: Enable device tree overlay support 2024-01-13 10:38:25 +05:30
build.config.gki
build.config.gki-debug.aarch64
build.config.gki-debug.x86_64
build.config.gki.aarch64 ANDROID: GKI: add Trimble symbol list 2025-01-16 06:41:15 -08:00
build.config.gki.x86_64
build.config.gki_kasan
build.config.gki_kasan.aarch64
build.config.gki_kasan.x86_64
build.config.gki_kprobes
build.config.gki_kprobes.aarch64
build.config.gki_kprobes.x86_64
build.config.hikey960
build.config.x86_64
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS This is the 5.4.255 stable release 2023-08-30 16:47:09 +00:00
Makefile This is the 5.4.294 stable release 2025-06-05 07:11:21 +00:00
OWNERS ANDROID: Use GKI Dr. No OWNERS file 2023-12-04 13:28:17 +00:00
README
README.md

How do I submit patches to Android Common Kernels

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

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

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

Additional requirements are listed below based on patch type

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

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

        This is the detailed description of the important patch

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

        This is the detailed description of the important patch

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

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

        This is the detailed description of the important patch

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

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

Requirements for other backports: FROMGIT:, FROMLIST:,

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

        This is the detailed description of the important patch

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

        This is the detailed description of the important patch

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

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

        This is the detailed description of the important patch

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

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

Requirements for Android-specific patches: ANDROID:

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

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)