Google GitGoogle Git
Sign in
android/kernel/common/50b3a256e550e98ff6a49d32e77fb67998707961
commit
50b3a256e550e98ff6a49d32e77fb67998707961
[log]
author
Greg Kroah-Hartman <gregkh@google.com>
Tue Jul 07 07:49:57 2026 +0000
committer
Greg Kroah-Hartman <gregkh@google.com>
Wed Jul 08 06:37:10 2026 +0000
tree
256d4f0001a1b18ad058e4f84e3e93e646ee78f3
parent
04063414c7d208654459368408315f96a3c0a801 [diff]
parent
738ac465e4e900d4a391a27da4e20c090eaa1e75 [diff]
Merge 5.10.260 into android13-5.10-lts

Changes in 5.10.260
	net/sched: act_pedit: use NLA_POLICY for parsing 'ex' keys
	net/sched: transition act_pedit to rcu and percpu stats
	net/sched: simplify tcf_pedit_act
	net/sched: act_pedit: remove extra check for key type
	net/sched: act_pedit: check static offsets a priori
	net/sched: act_pedit: rate limit datapath messages
	net/sched: act_pedit: Parse L3 Header for L4 offset
	net/sched: fix pedit partial COW leading to page cache corruption
	net/sched: act_pedit: free pedit keys on bail from offset check
	fuse: limit FUSE_NOTIFY_RETRIEVE to uptodate folios
	slimbus: qcom-ngd-ctrl: Register callbacks after creating the ngd
	drm/amd/display: Bound VBIOS record-chain walk loops
	ip6_vti: set netns_immutable on the fallback device.
	net: add skb_header_pointer_careful() helper
	net/sched: cls_u32: use skb_header_pointer_careful()
	drm/amd/display: Use krealloc_array() in dal_vector_reserve()
	net: 9p: fix refcount leak in p9_read_work() error handling
	netdevsim: Fix memory leak of nsim_dev->fa_cookie
	batman-adv: tt: reject oversized local TVLV buffers
	batman-adv: tt: prevent TVLV entry number overflow
	vfio/iommu_type1: replace kfree with kvfree
	RDMA/bnxt_re: zero shared page before exposing to userspace
	i2c: stub: Reject I2C block transfers with invalid length
	net: qualcomm: rmnet: fix endpoint use-after-free in rmnet_dellink()
	agp/amd64: Fix broken error propagation in agp_amd64_probe()
	regulator: core: fix locking in regulator_resolve_supply() error path
	vc_screen: fix null-ptr-deref in vcs_notifier() during concurrent vcs_write
	media: vidtv: fix NULL pointer dereference in vidtv_mux_push_si
	Documentation: ioctl-number: Extend "Include File" column width
	crypto: qat - Replace kzalloc() + copy_from_user() with memdup_user()
	crypto: qat - Return pointer directly in adf_ctl_alloc_resources
	crypto: qat - remove unused character device and IOCTLs
	net/sched: act_pedit: fix action bind logic
	batman-adv: tp_meter: keep unacked list in ascending ordered
	batman-adv: tp_meter: initialize dup_acks explicitly
	batman-adv: tp_meter: initialize dec_cwnd explicitly
	batman-adv: tp_meter: avoid window underflow
	batman-adv: tp_meter: avoid divide-by-zero for dec_cwnd
	batman-adv: tp_meter: fix fast recovery precondition
	batman-adv: tp_meter: handle seqno wrap-around for fast recovery detection
	batman-adv: tp_meter: add only finished tp_vars to lists
	batman-adv: bla: annotate lasttime access with READ/WRITE_ONCE
	batman-adv: prevent ELP transmission interval underflow
	batman-adv: tp_meter: initialize last_recv_time during init
	batman-adv: frag: ensure fragment is writable before modifying TTL
	batman-adv: frag: avoid underflow of TTL
	batman-adv: v: prevent OGM aggregation on disabled hardif
	batman-adv: tp_meter: restrict number of unacked list entries
	batman-adv: tp_meter: annotate last_recv_time access with READ/WRITE_ONCE
	batman-adv: tp_meter: prevent parallel modifications of last_recv
	batman-adv: tp_meter: handle overlapping packets
	batman-adv: tt: don't merge change entries with different VIDs
	batman-adv: tt: track roam count per VID
	batman-adv: dat: prevent false sharing between VLANs
	batman-adv: tvlv: enforce 2-byte alignment
	batman-adv: tvlv: avoid race of cifsnotfound handler state
	ring-buffer: Remove ring_buffer_read_prepare_sync()
	ext4: add bounds check for inline data length in ext4_read_inline_page
	crypto: af_alg - Set merge to zero early in af_alg_sendmsg
	net: cpsw_new: Fix potential unregister of netdev that has not been registered yet
	mac802154: llsec: add skb_cow_data() before in-place crypto
	KEYS: fix overflow in keyctl_pkey_params_get_2()
	keys: Pin request_key_auth payload in instantiate paths
	wifi: mt76: mt76x2u: Add support for ELECOM WDC-867SU3S
	wifi: ath11k: fix warning when unbinding
	wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor
	f2fs: validate ACL entry sizes in f2fs_acl_from_disk()
	bpf: use kvfree() for replaced sysctl write buffer
	MIPS: DEC: Prevent initial console buffer from landing in XKPHYS
	exfat: fix potential use-after-free in exfat_find_dir_entry()
	tipc: fix slab-use-after-free Read in tipc_aead_decrypt_done
	pNFS: Fix use-after-free in pnfs_update_layout()
	irqchip/imgpdc: Fix resource leak, add missing chained handler cleanup on remove
	fpga: region: fix use-after-free in child_regions_with_firmware()
	ocfs2: reject oversized group bitmap descriptors
	KVM: SVM: Fix page overflow in sev_dbg_crypt() for ENCRYPT path
	fbdev: Fix fb_new_modelist to prevent null-ptr-deref in fb_videomode_to_var
	fbdev: modedb: Fix misaligned fields in the 1920x1080-60 mode
	NFSD: Fix SECINFO_NO_NAME decode error cleanup
	nfsd: fix posix_acl leak on SETACL decode failure
	nfsd: check get_user() return when reading princhashlen
	dlm: prevent NPD when writing a positive value to event_done
	usb: cdns3: gadget: fix NULL pointer dereference in ep_queue
	bnxt_en: Modify bnxt_disable_int_sync() to be called more than once.
	bnxt_en: Fix NULL pointer dereference
	hv: utils: handle and propagate errors in kvp_register
	mptcp: fix missing wakeups in edge scenarios
	misc: fastrpc: Add dma_mask to fastrpc_channel_ctx
	misc: fastrpc: Fix NULL pointer dereference in rpmsg callback
	Drivers: hv: vmbus: Improve the logic of reserving fb_mmio on Gen2 VMs
	phonet: Pass ifindex to fill_addr().
	phonet: Pass net and ifindex to phonet_address_notify().
	net: phonet: free phonet_device after RCU grace period
	mmc: renesas_sdhi: Add OF entry for RZ/G2H SoC
	misc: fastrpc: fix DMA address corruption due to find_vma misuse
	virtiofs: fix UAF on submount umount
	Linux 5.10.260

Change-Id: I959f8590d2392a2703ddc1a371684c99d39ed2c6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 256d4f0001a1b18ad058e4f84e3e93e646ee78f3
  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.gki
  43. build.config.gki-debug.aarch64
  44. build.config.gki-debug.x86_64
  45. build.config.gki.aarch64
  46. build.config.gki.aarch64.fips140
  47. build.config.gki.x86_64
  48. build.config.gki_kasan
  49. build.config.gki_kasan.aarch64
  50. build.config.gki_kasan.x86_64
  51. build.config.gki_kprobes
  52. build.config.gki_kprobes.aarch64
  53. build.config.gki_kprobes.x86_64
  54. build.config.hikey960
  55. build.config.khwasan
  56. build.config.rockchip
  57. build.config.rockpi4
  58. build.config.x86_64
  59. COPYING
  60. CREDITS
  61. Kbuild
  62. Kconfig
  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 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 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)