Google Git
Sign in
android / kernel / common / 10896fff34b1cc07336f71173f7a7e19f235323f
commit10896fff34b1cc07336f71173f7a7e19f235323f[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Wed Feb 14 14:10:04 2024 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Wed Feb 14 14:10:51 2024 +0000
tree3e49e02944ab946679fdeb53b043ff3d783c026c
parent7edcfba3840345d76f00dd0a48c5a2e5fb38784d [diff]
parent13fdad03e6ea0044b4ede45eb68693a39cb3fcd1 [diff]
Merge branch 'android12-5.10' into branch 'android12-5.10-lts'

Catch the -lts branch up with the changes in the normal branch.

This includes the following commits:

* 13fdad03e6ea ANDROID: GKI: fix ABI breakage in struct ipv6_devconf
* be6ad5e4395a Reapply "net: release reference to inet6_dev pointer"
* a4508eb5526a Reapply "net: change accept_ra_min_rtr_lft to affect all RA lifetimes"
* d4c4255fb453 Reapply "net: add sysctl accept_ra_min_rtr_lft"
* 08538f14e5ec ANDROID: GKI: explicit include of stringify.h
* c9ca12bfd28b ANDROID: introduce a vendor hook to allow speculative swap pagefaults
* d47a714fa7ce ANDROID: mm: allow limited speculative page faulting in do_swap_page()
* febebd3d31fa UPSTREAM: net: tls, update curr on splice as well
* db57c320fa5e ANDROID: GKI: Update oplus symbol list
* 0a9731879a2f ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job
* 8cbe4885a90f ANDROID: GKI: Update oplus symbol list
* 46469e117ff8 ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags
* 5fe6b5a1940a Reapply "perf: Fix perf_event_validate_size()"
* 067856b87f30 UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* fd764687e848 UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
* 102b3d7a649d UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl
*   f6de6842979b Merge "Merge tag 'android12-5.10.205_r00' into branch 'android12-5.10'" into android12-5.10
|\
| * 3afa5a433145 Merge tag 'android12-5.10.205_r00' into branch 'android12-5.10'
* | 40c0aa9ee129 Reapply "perf: Disallow mis-matched inherited group reads"
* | 789c68e980a2 ANDROID: scsi: ufs: UFS HPB feature not working
* | 75c057fe65b2 ANDROID: GKI: Update symbol list for mtk
|/
* cbfcf517dc42 FROMGIT: usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
* 050c668fefb2 FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields
* 7efc668a498e ANDROID: ABI: update allowed list for galaxy
* 3e4106c3c95a BACKPORT: exfat: reduce block requests when zeroing a cluster
* a5ea932a75e3 UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
* 99512f12160f FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
* d5552f63b8bc UPSTREAM: dm verity: don't perform FEC for failed readahead IO
* 22747510994b UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
* a72131befe6f UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* 718225bcc1ee UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space
* 5b118b5b1db5 UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space
* 0edf68775aab UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
* f22c548c9123 FROMLIST: binder: fix memory leaks of spam and pending work
* 5144c1c2e3cc ANDROID: Snapshot Mainline's version of checkpatch.pl
* b39b9bde93fa ANDROID: scsi: ufs: vendor check response and recovery addition
* 4246d242fa1b ANDROID: scsi: ufs: add perf heuristic design
* 83578817d0ce ANDROID: ABI: Update symbol list for Mediatek
* 85d8fb91634a ANDROID: Add vendor hook for ufs perf heuristic and error recovery
* 7b8b02fa37b8 UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
* 469a933a87af UPSTREAM: ufs: core: wlun send SSU timeout recovery
* 1b6cfcd1ed7f ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
* ced76f823f64 ANDROID: fix up rpmsg_device ABI break
* 72b5689f0260 ANDROID: fix up platform_device ABI break
* 417208650315 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* 0f4467ff35d9 UPSTREAM: rpmsg: glink: Release driver_override
* fa6692abc294 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* 20f1dfc0f798 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* 68482b6bd959 UPSTREAM: rpmsg: Constify local variable in field store macro
* 66b73fb5b9e3 UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* 525ecbbfda3c FROMGIT: Input: uinput - allow injecting event times
* e6278ff4b708 ANDROID: abi_gki_aarch64_qcom: Add android_gki_sysctl_vals
* 4194727e2ccb UPSTREAM: kheaders: Have cpio unconditionally replace files
* efe30da3a332 ANDROID: ABI: Update oplus symbol list
* 464ef3ee5942 ANDROID: vendor_hooks: Add hooks for binder
* ba88bbf1bb7e BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
* 10120b0270b5 UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()
*   f40707abde2e Merge "Merge tag 'android12-5.10.198_r00' into android12-5.10" into android12-5.10
|\
| * 1289e04b4813 Merge tag 'android12-5.10.198_r00' into android12-5.10
* 422887ef073a ANDROID: GKI: Update symbols to symbol list
* 91d24272180b ANDROID: Add Interrupt Hook for madvise Compression
* 4e38f783daad UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c

Change-Id: I9ace27ef5bb0f8ae42d808292ed4f5b9778ac8a6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 3e49e02944ab946679fdeb53b043ff3d783c026c
  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.config.aarch64
  32. build.config.allmodconfig
  33. build.config.allmodconfig.aarch64
  34. build.config.allmodconfig.arm
  35. build.config.allmodconfig.x86_64
  36. build.config.amlogic
  37. build.config.arm
  38. build.config.common
  39. build.config.db845c
  40. build.config.gki
  41. build.config.gki-debug.aarch64
  42. build.config.gki-debug.x86_64
  43. build.config.gki.aarch64
  44. build.config.gki.aarch64.fips140
  45. build.config.gki.aarch64.fips140_eval_testing
  46. build.config.gki.x86_64
  47. build.config.gki_kasan
  48. build.config.gki_kasan.aarch64
  49. build.config.gki_kasan.x86_64
  50. build.config.gki_kprobes
  51. build.config.gki_kprobes.aarch64
  52. build.config.gki_kprobes.x86_64
  53. build.config.hikey960
  54. build.config.khwasan
  55. build.config.rockchip
  56. build.config.x86_64
  57. COPYING
  58. CREDITS
  59. Kbuild
  60. Kconfig
  61. MAINTAINERS
  62. Makefile
  63. OWNERS
  64. README
  65. 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)