Google Git
Sign in
android / kernel / common / ad06eaf051cd0bdfd330f378c91f537107ce938e
commitad06eaf051cd0bdfd330f378c91f537107ce938e[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Fri Apr 12 12:09:56 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Fri Apr 12 12:10:49 2024 +0000
tree2a076853d2f954fdf0a4a0cc2c2da0c8af458b61
parent993bed180178156a70afdafe8aaf23a117107352 [diff]
parent9ef28a4a5e0b358d3bd08c23b8283fbfbe85394b [diff]
Merge branch 'android13-5.15' into branch 'android13-5.15-lts'

Catch the LTS branch up with the changed done on the normal one.  This
includes a number of abi updates.  Included in here are the following
commits:

* 9ef28a4a5e0b ANDROID: ABI: Update oplus symbol list
* 4ba622c88062 BACKPORT: dm-crypt: Fix IO priority lost when queuing write bios
* 21bc63de9896 BACKPORT: dm-verity: Fix IO priority lost when reading FEC and hash
* a6ac2684fcca BACKPORT: dm-bufio: Support IO priority
* 105ddd316117 BACKPORT: dm-io: Support IO priority
* 145f5ae7e66b BACKPORT: block: Fix where bio IO priority gets set
* d2356f0a55a4 UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* 677308ef6665 BACKPORT: xhci: track port suspend state correctly in unsuccessful resume cases
* 54c78a9705c3 BACKPORT: usb: host: xhci: Avoid XHCI resume delay if SSUSB device is not present
* 296c8dcf32e8 BACKPORT: mm: update mark_victim tracepoints fields
* a103ad7575a5 Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
* 2e1b2c252f57 UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
* 136c89d013c6 ANDROID: GKI: Update symbol list for Amlogic
* 6d5bd08e93de ANDROID: Update abi_gki_aarch64_qcom symbol
* a14a7d1607c6 UPSTREAM: ARM: 9269/1: vfp: Add hwcap for FEAT_DotProd
* 91ca2bfac0c2 UPSTREAM: ARM: 9268/1: vfp: Add hwcap FPHP and ASIMDHP for FEAT_FP16
* 768ae8ad724e UPSTREAM: ARM: 9267/1: Define Armv8 registers in AArch32 state
* d76a750f6ffe FROMLIST: binder: check offset alignment in binder_get_object()
* afb3d0418799 ANDROID: Update abi_gki_aarch64_qcom for fw_devlink_purge_absent_suppliers
* 79167160daa4 Merge tag 'android13-5.15.148_r00' into android13-5.15
* c68af5a4aa8b UPSTREAM: usb: dwc3: gadget: Don't disconnect if not started
* 192ec99b329f ANDROID: Update the GKI symbol list and ABI XML
* 455774fb7d04 UPSTREAM: netfilter: nf_tables: disallow timeout for anonymous sets
* 876d0386b08f ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended
* ba6ef9bdef8e ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE
* 77741f2aac1f FROMGIT: usb: host: xhci-plat: Set XHCI_STATE_REMOVING before resuming XHCI HC
* 3dad6bbbf0a0 FROMGIT: usb: host: xhci: Do not re-initialize the XHCI HC if being removed
* fd6ffbfe9e4c ANDROID: uid_sys_stat: fix data-error of cputime and io
* ae4e545e708d ANDROID: fix isolate_migratepages_range return value
* 0daa9d94a81a ANDROID: GKI: Update oplus symbol list
* 796c7df4f5f4 ANDROID: update symbol for unisoc whitelist
* ca5564fc0a0f ANDROID: TRACE: mm: export mm_filemap_* for calling in ko
* 642839b475f4 ANDROID: abi_gki_aarch64_qcom: Export trace_android_vh_try_fixup_sea
* 4b37cfc44755 ANDROID: arm64: Call fixup_exception() within do_sea()
* c1b66b52a4e6 ANDROID: ABI: Add avenrun symbol to symbol list for unisoc
* 4782f1c23370 FROMGIT: usb: xhci: Add error handling in xhci_map_urb_for_dma
* 9b613572d624 ANDROID: userfaultfd: allow SPF for UFFD_FEATURE_SIGBUS on private+anon
* a2e42c95c3a5 UPSTREAM: usb: dwc3: gadget: Handle EP0 request dequeuing properly
* 611a5f3b5018 BACKPORT: hwrng: virtio - unregister device before reset
* 8ec555a90208 Revert "interconnect: Fix locking for runpm vs reclaim"
* 27d93dc9223f UPSTREAM: virtio-rng: make device ready before making request
* 0ac651d03397 Revert "interconnect: Teach lockdep about icc_bw_lock order"
* 3389e4dee5ef ANDROID: ABI: Update oplus symbol list
* bb86b9f453df ANDROID: binder: Add vendor hook to fix priority restore
* 701ed3a62b7a UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
* 12c909f79575 BACKPORT: FROMGIT: PM: runtime: add tracepoint for runtime_status changes
* 681363906d8e BACKPORT: UPSTREAM: tick/sched: Preserve number of idle sleeps across CPU hotplug events
* 9393aa385243 BACKPORT: UPSTREAM: tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug
* 22789c4dfcde ANDROID: GKI: Add symbol list for Nothing
* 490fc49c3f0f ANDROID: thermal: Add vendor thermal_pm_notify_suspend function
* 34d2057e4a3e ANDROID: ABI: Update oplus symbol list
* 5b6eaab5be1f ANDROID: GKI: add more vfs-only exports to their own namespace
* 2bbf68d8310b ANDROID: fs: Export free_fs_struct,copy_fs_struct.

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