Google Git
Sign in
android / kernel / common.git / 2b0f2da2e0e44ad09fa7f064378f4f62773aed1e
commit2b0f2da2e0e44ad09fa7f064378f4f62773aed1e[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Tue Sep 30 13:04:00 2025 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Tue Sep 30 13:04:00 2025 +0000
treed05eb1e35c0b37acba3d106a57b1763d72c4d046
parent080c8fab09d9ba7a91af3f531d53eebda031c492 [diff]
parent7b34dc04e4ff0f37ba4ad8414f42abae9f8f68e4 [diff]
Merge 6.1.154 into android14-6.1-lts

Changes in 6.1.154
	ALSA: firewire-motu: drop EPOLLOUT from poll return values as write is not supported
	wifi: mac80211: increase scan_ies_len for S1G
	wifi: mac80211: fix incorrect type for ret
	pcmcia: omap_cf: Mark driver struct with __refdata to prevent section mismatch
	cgroup: split cgroup_destroy_wq into 3 workqueues
	btrfs: fix invalid extref key setup when replaying dentry
	um: virtio_uml: Fix use-after-free after put_device in probe
	dpaa2-switch: fix buffer pool seeding for control traffic
	qed: Don't collect too many protection override GRC elements
	mptcp: set remote_deny_join_id0 on SYN recv
	net: natsemi: fix `rx_dropped` double accounting on `netif_rx()` failure
	i40e: remove redundant memory barrier when cleaning Tx descs
	bonding: don't set oif to bond dev when getting NS target destination
	tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect().
	tls: make sure to abort the stream if headers are bogus
	Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set"
	net: liquidio: fix overflow in octeon_init_instr_queue()
	cnic: Fix use-after-free bugs in cnic_delete_task
	octeontx2-pf: Fix use-after-free bugs in otx2_sync_tstamp()
	ksmbd: smbdirect: validate data_offset and data_length field of smb_direct_data_transfer
	ksmbd: smbdirect: verify remaining_data_length respects max_fragmented_recv_size
	nilfs2: fix CFI failure when accessing /sys/fs/nilfs2/features/*
	power: supply: bq27xxx: fix error return in case of no bq27000 hdq battery
	power: supply: bq27xxx: restrict no-battery detection to bq27000
	LoongArch: Align ACPI structures if ARCH_STRICT_ALIGN enabled
	LoongArch: Check the return value when creating kobj
	iommu/vt-d: Fix __domain_mapping()'s usage of switch_to_super_page()
	btrfs: tree-checker: fix the incorrect inode ref size check
	ASoC: qcom: audioreach: Fix lpaif_type configuration for the I2S interface
	ASoC: qcom: q6apm-lpass-dais: Fix missing set_fmt DAI op for I2S
	mmc: mvsdio: Fix dma_unmap_sg() nents value
	KVM: SVM: Sync TPR from LAPIC into VMCB::V_TPR even if AVIC is active
	rds: ib: Increment i_fastreg_wrs before bailing out
	selftests: mptcp: avoid spurious errors on TCP disconnect
	ALSA: hda/realtek: Fix mute led for HP Laptop 15-dw4xx
	io_uring: backport io_should_terminate_tw()
	io_uring: include dying ring in task_work "should cancel" state
	ASoC: wm8940: Correct typo in control name
	ASoC: wm8974: Correct PLL rate rounding
	ASoC: SOF: Intel: hda-stream: Fix incorrect variable used in error message
	drm: bridge: anx7625: Fix NULL pointer dereference with early IRQ
	drm: bridge: cdns-mhdp8546: Fix missing mutex unlock on error path
	crypto: af_alg: Indent the loop in af_alg_sendmsg()
	crypto: af_alg - Set merge to zero early in af_alg_sendmsg
	smb: client: fix smbdirect_recv_io leak in smbd_negotiate() error path
	mptcp: pm: nl: announce deny-join-id0 flag
	selftests: mptcp: userspace pm: validate deny-join-id0 flag
	phy: broadcom: ns-usb3: fix Wvoid-pointer-to-enum-cast warning
	phy: Use device_get_match_data()
	phy: ti: omap-usb2: fix device leak at unbind
	xhci: dbc: decouple endpoint allocation from initialization
	xhci: dbc: Fix full DbC transfer ring after several reconnects
	mptcp: propagate shutdown to subflows when possible
	selftests: mptcp: connect: catch IO errors on listen side
	net: rfkill: gpio: add DT support
	net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
	ASoC: qcom: q6apm-lpass-dai: close graphs before opening a new one
	ASoC: q6apm-lpass-dai: close graph on prepare errors
	ASoC: qcom: q6apm-lpass-dais: Fix NULL pointer dereference if source graph failed
	crypto: af_alg: Convert af_alg_sendpage() to use MSG_SPLICE_PAGES
	crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
	Linux 6.1.154

Change-Id: Ib151697f5310368e792f0fea0bdd2f73585769a3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: d05eb1e35c0b37acba3d106a57b1763d72c4d046
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. io_uring/
  12. ipc/
  13. kernel/
  14. lib/
  15. LICENSES/
  16. mm/
  17. net/
  18. rust/
  19. samples/
  20. scripts/
  21. security/
  22. sound/
  23. tools/
  24. usr/
  25. virt/
  26. .clang-format
  27. .cocciconfig
  28. .get_maintainer.ignore
  29. .gitattributes
  30. .gitignore
  31. .mailmap
  32. .rustfmt.toml
  33. BUILD.bazel
  34. build.config.aarch64
  35. build.config.allmodconfig
  36. build.config.allmodconfig.aarch64
  37. build.config.allmodconfig.arm
  38. build.config.allmodconfig.x86_64
  39. build.config.amlogic
  40. build.config.arm
  41. build.config.common
  42. build.config.constants
  43. build.config.crashdump
  44. build.config.crashdump.aarch64
  45. build.config.crashdump.x86_64
  46. build.config.db845c
  47. build.config.gki
  48. build.config.gki-debug.aarch64
  49. build.config.gki-debug.x86_64
  50. build.config.gki.aarch64
  51. build.config.gki.aarch64.fips140
  52. build.config.gki.riscv64
  53. build.config.gki.x86_64
  54. build.config.gki_kasan
  55. build.config.gki_kasan.aarch64
  56. build.config.gki_kasan.x86_64
  57. build.config.gki_kprobes
  58. build.config.gki_kprobes.aarch64
  59. build.config.gki_kprobes.x86_64
  60. build.config.khwasan
  61. build.config.microdroid
  62. build.config.microdroid.aarch64
  63. build.config.microdroid.x86_64
  64. build.config.riscv64
  65. build.config.rockchip
  66. build.config.rockpi4
  67. build.config.x86_64
  68. COPYING
  69. CREDITS
  70. Kbuild
  71. Kconfig
  72. Kconfig.ext
  73. MAINTAINERS
  74. Makefile
  75. modules.bzl
  76. OWNERS
  77. README
  78. README.md
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.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

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

Common Kernel patch requirements

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

Additional requirements are listed below based on patch type

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

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

        This is the detailed description of the important patch

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

        This is the detailed description of the important patch

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

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

        This is the detailed description of the important patch

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

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

Requirements for other backports: FROMGIT:, FROMLIST:,

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

        This is the detailed description of the important patch

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

        This is the detailed description of the important patch

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

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

        This is the detailed description of the important patch

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

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

Requirements for Android-specific patches: ANDROID:

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

        This is the detailed description of the important fix

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