Google Git
Sign in
android / kernel / common.git / refs/heads/android14-6.1-lts
commit6f6441d9aa57fe509241727abf9727d132be6a72[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Thu Oct 02 14:10:37 2025 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Thu Oct 02 14:10:37 2025 +0000
treeaab54a4c6ba76416e1ad018d9352a8be8398ff3e
parent2b0f2da2e0e44ad09fa7f064378f4f62773aed1e [diff]
parent882efbdd9d34ebaf03da2dd0246f07f251b0aed2 [diff]
Merge 6.1.155 into android14-6.1-lts

Changes in 6.1.155
	ALSA: usb-audio: Fix block comments in mixer_quirks
	ALSA: usb-audio: Drop unnecessary parentheses in mixer_quirks
	ALSA: usb-audio: Avoid multiple assignments in mixer_quirks
	ALSA: usb-audio: Simplify NULL comparison in mixer_quirks
	ALSA: usb-audio: Remove unneeded wmb() in mixer_quirks
	ALSA: usb-audio: Add mixer quirk for Sony DualSense PS5
	ALSA: usb-audio: Convert comma to semicolon
	ALSA: usb-audio: Fix build with CONFIG_INPUT=n
	usb: core: Add 0x prefix to quirks debug output
	ALSA: usb-audio: Add DSD support for Comtrue USB Audio device
	ALSA: usb-audio: move mixer_quirks' min_mute into common quirk
	ALSA: usb-audio: Add mute TLV for playback volumes on more devices
	IB/mlx5: Fix obj_type mismatch for SRQ event subscriptions
	mm/gup: revert "mm: gup: fix infinite loop within __get_longterm_locked"
	mm: add folio_expected_ref_count() for reference count calculation
	mm/gup: check ref_count instead of lru before migration
	mm/gup: local lru_add_drain() to avoid lru_add_drain_all()
	mm: folio_may_be_lru_cached() unless folio_test_large()
	arm64: dts: imx8mp: Correct thermal sensor index
	cpufreq: Initialize cpufreq-based invariance before subsys
	smb: server: don't use delayed_work for post_recv_credits_work
	can: rcar_can: rcar_can_resume(): fix s2ram with PSCI
	bpf: Reject bpf_timer for PREEMPT_RT
	can: etas_es58x: sort the includes by alphabetic order
	can: etas_es58x: populate ndo_change_mtu() to prevent buffer overflow
	can: hi311x: populate ndo_change_mtu() to prevent buffer overflow
	can: sun4i_can: populate ndo_change_mtu() to prevent buffer overflow
	can: mcba_usb: populate ndo_change_mtu() to prevent buffer overflow
	can: peak_usb: fix shift-out-of-bounds issue
	ethernet: rvu-af: Remove slash from the driver name
	Bluetooth: hci_sync: Fix hci_resume_advertising_sync
	Bluetooth: hci_event: Fix UAF in hci_acl_create_conn_sync
	bnxt_en: correct offset handling for IPv6 destination address
	nexthop: Forbid FDB status change while nexthop is in a group
	selftests: fib_nexthops: Fix creation of non-FDB nexthops
	net: dsa: lantiq_gswip: do also enable or disable cpu port
	net: dsa: lantiq_gswip: move gswip_add_single_port_br() call to port_setup()
	net: dsa: lantiq_gswip: suppress -EINVAL errors for bridge FDB entries added to the CPU port
	octeontx2-pf: Fix potential use after free in otx2_tc_add_flow()
	drm/gma500: Fix null dereference in hdmi teardown
	futex: Prevent use-after-free during requeue-PI
	i40e: fix idx validation in i40e_validate_queue_map
	i40e: fix input validation logic for action_meta
	i40e: add max boundary check for VF filters
	i40e: add mask to apply valid bits for itr_idx
	i40e: improve VF MAC filters accounting
	crypto: af_alg - Fix incorrect boolean values in af_alg_ctx
	tracing: dynevent: Add a missing lockdown check on dynevent
	afs: Fix potential null pointer dereference in afs_put_server
	mm/hugetlb: fix folio is still mapped when deleted
	fbcon: fix integer overflow in fbcon_do_set_font
	fbcon: Fix OOB access in font allocation
	s390/cpum_cf: Fix uninitialized warning after backport of ce971233242b
	mm: migrate_device: use more folio in migrate_device_finalize()
	mm/migrate_device: don't add folio to be freed to LRU in migrate_device_finalize()
	minmax: add in_range() macro
	minmax: Introduce {min,max}_array()
	minmax: deduplicate __unconst_integer_typeof()
	minmax: fix indentation of __cmp_once() and __clamp_once()
	minmax: avoid overly complicated constant expressions in VM code
	drm/ast: Use msleep instead of mdelay for edid read
	i40e: fix validation of VF state in get resources
	i40e: fix idx validation in config queues msg
	i40e: increase max descriptors for XL710
	i40e: add validation for ring_len param
	kmsan: fix out-of-bounds access to shadow memory
	minmax: make generic MIN() and MAX() macros available everywhere
	minmax: add a few more MIN_T/MAX_T users
	minmax: simplify and clarify min_t()/max_t() implementation
	drm/i915/backlight: Return immediately when scale() finds invalid parameters
	Linux 6.1.155

Change-Id: I57114695902ddc67ef8a65d71fac692a5e148386
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: aab54a4c6ba76416e1ad018d9352a8be8398ff3e
  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)