Google Git
Sign in
android/kernel/common/057fdbf6d3c79123ad58eb55aa2428b2d951b04d
commit
057fdbf6d3c79123ad58eb55aa2428b2d951b04d
[log] [tgz]
author
Greg Kroah-Hartman <gregkh@google.com>
Thu Nov 20 13:28:12 2025 +0000
committer
Greg Kroah-Hartman <gregkh@google.com>
Fri Nov 21 08:19:27 2025 +0000
tree
a9e3350327ce62dc3e75c9d9a47375c1806f7717
parent
db7360f9acaf9490e1def7963f97c5b47bbc84f2 [diff]
parent
cc5ec87693063acebb60f587e8a019ba9b94ae0e [diff]
Merge 5.15.196 into android13-5.15-lts

Changes in 5.15.196
	r8152: add error handling in rtl8152_driver_init
	jbd2: ensure that all ongoing I/O complete before freeing blocks
	ext4: detect invalid INLINE_DATA + EXTENTS flag combination
	btrfs: fix clearing of BTRFS_FS_RELOC_RUNNING if relocation already running
	media: s5p-mfc: remove an unused/uninitialized variable
	media: rc: Directly use ida_free()
	media: lirc: Fix error handling in lirc_register()
	blk-crypto: fix missing blktrace bio split events
	drm/exynos: exynos7_drm_decon: fix uninitialized crtc reference in functions
	drm/exynos: exynos7_drm_decon: properly clear channels during bind
	drm/exynos: exynos7_drm_decon: remove ctx->suspended
	crypto: rockchip - Fix dma_unmap_sg() nents value
	cpufreq: CPPC: Avoid using CPUFREQ_ETERNAL as transition delay
	HID: multitouch: fix sticky fingers
	dax: skip read lock assertion for read-only filesystems
	can: m_can: m_can_plat_remove(): add missing pm_runtime_disable()
	net: dlink: handle dma_map_single() failure properly
	doc: fix seg6_flowlabel path
	r8169: fix packet truncation after S4 resume on RTL8168H/RTL8111H
	net/ip6_tunnel: Prevent perpetual tunnel growth
	amd-xgbe: Avoid spurious link down messages during interface toggle
	tcp: fix tcp_tso_should_defer() vs large RTT
	tg3: prevent use of uninitialized remote_adv and local_adv variables
	splice, net: Add a splice_eof op to file-ops and socket-ops
	net: tls: wait for async completion on last message
	tls: wait for async encrypt in case of error during latter iterations of sendmsg
	tls: always set record_type in tls_process_cmsg
	tls: don't rely on tx_work during send()
	net: usb: use eth_hw_addr_set() instead of ether_addr_copy()
	net: usb: lan78xx: Add error handling to lan78xx_init_mac_address
	net: usb: lan78xx: fix use of improperly initialized dev->chipid in lan78xx_reset
	riscv: kprobes: Fix probe address validation
	drm/amd/powerplay: Fix CIK shutdown temperature
	sched/balancing: Rename newidle_balance() => sched_balance_newidle()
	sched/fair: Fix pelt lost idle time detection
	ALSA: firewire: amdtp-stream: fix enum kernel-doc warnings
	ALSA: usb-audio: Fix NULL pointer deference in try_to_register_card
	hfsplus: fix slab-out-of-bounds read in hfsplus_strcasecmp()
	PCI/sysfs: Ensure devices are powered for config reads (part 2)
	Revert "perf test: Don't leak workload gopipe in PERF_RECORD_*"
	exec: Fix incorrect type for ret
	nios2: ensure that memblock.current_limit is set when setting pfn limits
	hfs: clear offset and space out of valid records in b-tree node
	hfs: make proper initalization of struct hfs_find_data
	hfsplus: fix KMSAN uninit-value issue in __hfsplus_ext_cache_extent()
	hfs: validate record offset in hfsplus_bmap_alloc
	hfsplus: fix KMSAN uninit-value issue in hfsplus_delete_cat()
	dlm: check for defined force value in dlm_lockspace_release
	hfs: fix KMSAN uninit-value issue in hfs_find_set_zero_bits()
	hfsplus: return EIO when type of hidden directory mismatch in hfsplus_fill_super()
	m68k: bitops: Fix find_*_bit() signatures
	net: rtnetlink: add helper to extract msg type's kind
	net: rtnetlink: use BIT for flag values
	net: netlink: add NLM_F_BULK delete request modifier
	net: rtnetlink: add bulk delete support flag
	net: add ndo_fdb_del_bulk
	net: rtnetlink: add NLM_F_BULK support to rtnl_fdb_del
	rtnetlink: Allow deleting FDB entries in user namespace
	net: enetc: correct the value of ENETC_RXB_TRUESIZE
	dpaa2-eth: fix the pointer passed to PTR_ALIGN on Tx path
	arm64, mm: avoid always making PTE dirty in pte_mkwrite()
	sctp: avoid NULL dereference when chunk data buffer is missing
	net: bonding: fix possible peer notify event loss or dup issue
	Revert "cpuidle: menu: Avoid discarding useful information"
	MIPS: Malta: Fix keyboard resource preventing i8042 driver from registering
	ocfs2: clear extent cache after moving/defragmenting extents
	vsock: fix lock inversion in vsock_assign_transport()
	net: usb: rtl8150: Fix frame padding
	net: ravb: Ensure memory write completes before ringing TX doorbell
	USB: serial: option: add UNISOC UIS7720
	USB: serial: option: add Quectel RG255C
	USB: serial: option: add Telit FN920C04 ECM compositions
	usb/core/quirks: Add Huawei ME906S to wakeup quirk
	usb: raw-gadget: do not limit transfer length
	xhci: dbc: enable back DbC in resume if it was enabled before suspend
	binder: remove "invalid inc weak" check
	comedi: fix divide-by-zero in comedi_buf_munge()
	mei: me: add wildcat lake P DID
	most: usb: Fix use-after-free in hdm_disconnect
	most: usb: hdm_probe: Fix calling put_device() before device initialization
	serial: 8250_exar: add support for Advantech 2 port card with Device ID 0x0018
	arm64: cputype: Add Neoverse-V3AE definitions
	arm64: errata: Apply workarounds for Neoverse-V3AE
	s390/cio: Update purge function to unregister the unused subchannels
	xfs: rename the old_crc variable in xlog_recover_process
	xfs: fix log CRC mismatches between i386 and other architectures
	NFSD: Rework encoding and decoding of nfsd4_deviceid
	NFSD: Minor cleanup in layoutcommit processing
	NFSD: Fix last write offset handling in layoutcommit
	iio: imu: inv_icm42600: use = { } instead of memset()
	iio: imu: inv_icm42600: Avoid configuring if already pm_runtime suspended
	PM: runtime: Add new devm functions
	iio: imu: inv_icm42600: Simplify pm_runtime setup
	padata: Reset next CPU when reorder sequence wraps around
	fuse: allocate ff->release_args only if release is needed
	fuse: fix livelock in synchronous file put from fuseblk workers
	PCI: j721e: Enable ACSPCIE Refclk if "ti,syscon-acspcie-proxy-ctrl" exists
	PCI: j721e: Fix programming sequence of "strap" settings
	wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again
	PCI: rcar-host: Convert struct rcar_msi mask_lock into raw spinlock
	drm/amdgpu: use atomic functions with memory barriers for vm fault info
	vfs: Don't leak disconnected dentries on umount
	NFSD: Define a proc_layoutcommit for the FlexFiles layout type
	f2fs: fix wrong block mapping for multi-devices
	PCI: tegra194: Handle errors in BPMP response
	PCI: rcar: Finish transition to L1 state in rcar_pcie_config_access()
	PCI: rcar-host: Drop PMSR spinlock
	PCI: tegra194: Reset BARs when running in PCIe endpoint mode
	devcoredump: Fix circular locking dependency with devcd->mutex.
	xfs: always warn about deprecated mount options
	arch_topology: Fix incorrect error check in topology_parse_cpu_capacity()
	usb: gadget: Store endpoint pointer in usb_request
	usb: gadget: Introduce free_usb_request helper
	usb: gadget: f_ncm: Refactor bind path to use __free()
	usb: gadget: f_acm: Refactor bind path to use __free()
	net: rtnetlink: fix module reference count leak issue in rtnetlink_rcv_msg
	PCI: rcar: Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup()
	Linux 5.15.196

Change-Id: Ib238ade6ba76b86fc5b96a8b3889f8966aba693b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: a9e3350327ce62dc3e75c9d9a47375c1806f7717
  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. samples/
  19. scripts/
  20. security/
  21. sound/
  22. tools/
  23. usr/
  24. virt/
  25. .clang-format
  26. .cocciconfig
  27. .get_maintainer.ignore
  28. .gitattributes
  29. .gitignore
  30. .mailmap
  31. BUILD.bazel
  32. build.config.aarch64
  33. build.config.allmodconfig
  34. build.config.allmodconfig.aarch64
  35. build.config.allmodconfig.arm
  36. build.config.allmodconfig.x86_64
  37. build.config.amlogic
  38. build.config.arm
  39. build.config.common
  40. build.config.constants
  41. build.config.db845c
  42. build.config.gce.x86_64
  43. build.config.gki
  44. build.config.gki-debug.aarch64
  45. build.config.gki-debug.x86_64
  46. build.config.gki.aarch64
  47. build.config.gki.aarch64.fips140
  48. build.config.gki.x86_64
  49. build.config.gki_kasan
  50. build.config.gki_kasan.aarch64
  51. build.config.gki_kasan.x86_64
  52. build.config.gki_kprobes
  53. build.config.gki_kprobes.aarch64
  54. build.config.gki_kprobes.x86_64
  55. build.config.khwasan
  56. build.config.rockpi4
  57. build.config.x86_64
  58. COPYING
  59. CREDITS
  60. Kbuild
  61. Kconfig
  62. Kconfig.ext
  63. MAINTAINERS
  64. Makefile
  65. OWNERS
  66. README
  67. 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)