Google Git
Sign in
android / kernel / common / a15edf0b7a652ba9c0d5b2b7ce9438d419d3053d
commita15edf0b7a652ba9c0d5b2b7ce9438d419d3053d[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Thu Aug 24 18:10:52 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Thu Aug 24 18:12:03 2023 +0000
tree60af519dc50aa0358cfccac5bb6f6617b2f2e8ef
parent1463976ddc64e81b31046e7a2a09007263f54f10 [diff]
parent07610c78efc466811b0982c96b07f45fbcda7044 [diff]
Merge android13-5.15 into android13-5.15-lts

Sync up with a lot of abi updates and other bug fixes in the
android13-5.15 branch to make maintaining the -lts branch easier and to
ensure that no abi breakages are missed in lts merges.

This consists of the following commits:

* 07610c78efc4 ANDROID: ABI: Update oplus symbol list
* 014ca12b891b ANDROID: Export symbols to do reverse mapping within memcg in kernel modules.
* 4f49704212e0 ANDROID: Revert ABI breakage due to accidental CRC value changes
* 461099c5b435 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 1ca64932b3f0 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* 10800b39da40 ANDROID: ABI: Create symbol list for Microsoft
* d1cef5e9ada5 BACKPORT: UPSTREAM: perf: Fix function pointer case
* a2f1e57122c9 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 0578bb107fde UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* c1469dbe22fd UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* d2351ceb4c61 BACKPORT: arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
* 3ca64f2c1d4a UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* c4f310ecd58e UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* db2dc2ae80a3 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* f0fefbe05536 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
* 1c69349e0de4 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
* b9b42d6732ea ANDROID: add a new symbol to symbol list for unisoc
* 28caaf30853c ANDROID: mm: Add vendor hook to get status of the page being migrated
* 6537ae4cd5d2 ANDROID: GKI: update tuxera symbol list
* 67740efa3bb4 FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* af8ceb509128 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* eec496882b4b UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* dc2a55f68f3c UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* e90417271367 ANDROID: ABI: Add to QCOM symbols list
* 8dd7d8410d9c UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 60b4c8ea7459 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* daa0bd125ace BACKPORT: mm: skip CMA pages when they are not available
* 3db113cdcd32 Revert "BACKPORT: FROMGIT: mm: skip CMA pages when they are not available"
* b3dd32ce1e80 ANDROID: GKI: update xiaomi symbol list
* be8c80537155 FROMGIT: fs: drop_caches: draining pages before dropping caches
* b730973f764c ANDROID: GKI: Update symbols to symbol list
* 5aead1412d9e ANDROID: vendor_hook: fix the error record position of mutex
* e77972189dd1 BACKPORT: FROMGIT: usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
* 697790241e2c ANDROID: GKI: Update GKI symbol list and ABI XML
* a04724e31210 ANDROID: fuse-bpf: Use stored bpf for create_open
* df87c2692771 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* de1760631942 ANDROID: fuse-bpf: Check inode not null
* aa008180c18b ANDROID: fuse-bpf: Fix flock test compile error
* 326735624cda ANDROID: fuse-bpf: Add partial ioctl support
* 6d6ee09bb74f ANDROID: fuse-bpf: Add partial flock support
* 10391a144f76 ANDROID: ABI: update gki symbol list
* 255e2893869c ANDROID: Add vendor hook for cma adjusting
* f9dbe76124d6 ANDROID: GKI: Update exynos_wear symbol list
* e5366d0f9561 FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* a1cd02b590d7 FROMGIT: BACKPORT: Multi-gen LRU: Avoid race in inc_min_seq()
* c3b46dcc26d7 FROMGIT: BACKPORT: Multi-gen LRU: Fix per-zone reclaim
* 6371b5bc4cc7 ANDROID: ABI: Update oplus symbol list  ashmem: is_ashmem_file Export is_ashmem_file function which will be used by the minidump module to get ashmem info.
* cdabe27cec0d ANDROID: GKI: Update symbol list
* f9ac52c8b5cb ANDROID: vendor_hooks: Add hook for blk request
* bd148ab7d833 BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627
* e7b0c0e42a80 ANDROID: GKI: Update symbol list for Amlogic
* a85c984e4d51 ANDROID: GKI: add symbol list file for moto
* 8affb698042a ANDROID: ABI: Update oplus symbol list
* 458659366fb0 ANDROID: Inherit "user-aware property" across rtmutex.
* 930cf7174fe2 ANDROID: oplus: Update the ABI xml and symbol list
* 01e61d38593c ANDROID: vendor_hooks: Add hooks for lookaround
* bbd71c9a9e9f ANDROID: GKI: Update symbol list for Amlogic
* 4554a46a86e9 UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 8f388ad9a2fa UPSTREAM: fs/ntfs3: Check fields while reading
* 667d36849226 ANDROID: set kmi_symbol_list_add_only for Kleaf builds.

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