Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / kernel / common / ca562bf79c6548189b74cb5c925218561c0259a1
commitca562bf79c6548189b74cb5c925218561c0259a1[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Wed Feb 09 17:05:54 2022 +0100
committerGreg Kroah-Hartman <gregkh@google.com>Wed Feb 09 18:16:30 2022 +0100
treec01542e68a5c2510d814d1f42891e42fb39cb400
parentc3b53fcd9007ac9028b099e5f8c552cf55616fba [diff]
parent2a2327c4e8ac335069586354b280031105b9980e [diff]
Merge branch 'android12-5.10' into `android12-5.10-lts`

Sync up with android12-5.10 for the following commits:

2a2327c4e8ac FROMLIST: power_supply: Use of-thermal cdev registration API
b90fe5ef8f96 FROMLIST: power_supply: Register cooling device outside of probe
fc64efcd068c Revert "UPSTREAM: tracefs: Have tracefs directories not set OTH permission bits by default"
1eb3049da0eb FROMGIT: usb: dwc3: gadget: Prevent core from processing stale TRBs
ee1e2de73cc5 UPSTREAM: cgroup-v1: Require capabilities to set release_agent
7e6f112bebea FROMGIT: f2fs: move f2fs to use reader-unfair rwsems
23686f5ee870 UPSTREAM: f2fs: do not bother checkpoint by f2fs_get_node_info
fa055ddfd585 BACKPORT: f2fs: avoid down_write on nat_tree_lock during checkpoint
c8701aa0a76b ANDROID: GKI: enable RCU_BOOST
c34fa06f4bbb FROMLIST: rcu: Don't deboost before reporting expedited quiescent state
3a49d3b67726 FROMGIT: usb: f_fs: Fix use-after-free for epfile
250abe08bbb4 UPSTREAM: usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.
d449d91bc954 ANDROID: update new gki symbol
b2fcb7b63b30 ANDROID: abi: qcom: Add dma_{alloc,free}_noncoherent
5d79e49205a6 UPSTREAM: binder: fix async_free_space accounting for empty parcels
6aa9e78d6e98 FROMGIT: rcu: Allow expedited RCU grace periods on incoming CPUs
2f61ec09b01c ANDROID: abi_gki_aarch64_qcom: Add iommu_setup_dma_ops restricted vh
6a9ff8fa2669 ANDROID: iommu: Add restricted vendor hook
2aba795b317c FROMLIST: arm64: cpufeature: List early Cortex-A510 parts as having broken dbm
2861bbc5b5a4 FROMLIST: arm64: Add Cortex-A510 CPU part definition
b0d13db791b8 FROMGIT: printk: ringbuffer: Improve prb_next_seq() performance
4b1862e4fc69 ANDROID: incremental-fs: fix GPF in pending_reads_dispatch_ioctl
445019bbca5d UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
032a6762957f UPSTREAM: tee: handle lookup of shm with reference count 0
d461f54be339 ANDROID: Incremental-fs: Doc: correct a sysfs path in incfs.rst
1bfc9c16ae45 ANDROID: selftests: fix incfs_test
fd4c6594f5ce ANDROID: incremental-fs: fix mount_fs issue
a512242e66ce BACKPORT: arm64: errata: Add workaround for TSB flush failures
e48051244a03 UPSTREAM: arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
dd3256d4392c UPSTREAM: coresight: trbe: Defer the probe on offline CPUs
71aebf8793c5 UPSTREAM: coresight: etm4x: Use Trace Filtering controls dynamically
2bb8b3c90759 BACKPORT: coresight: etm4x: Save restore TRFCR_EL1
79b64fa78085 UPSTREAM: coresight: tmc-etr: Speed up for bounce buffer in flat mode
aee6af704646 UPSTREAM: coresight: tmc-etr: Add barrier after updating AUX ring buffer
a0009ade3873 Revert half of "ANDROID: cpu/hotplug: create vendor hook for cpu_up/cpu_down"
a863cef344a0 Revert half of "ANDROID: arm64: add vendor hooks for bti and pauth fault"
9f58bcd61459 Revert half of "ANDROID: vendor_hooks: Add param for android_vh_cpu_up/down"
4b3396046c76 Revert "ANDROID: vendor_hooks: Add a hook for task tagging"
d8fe0b1fc2f5 Revert "ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle"
92ab2aeca5ae Revert "ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle"
b3e6d6eec69f Revert "ANDROID: vendor_hooks: add hook and OEM data for slab shrink"
e09000ee1915 Revert half of "ANDROID: vendor_hooks: Add hooks for memory when debug"
3f305a910171 Revert half of "ANDROID: gic-v3: Add vendor hook to GIC v3"
3b4ca92614fd Merge tag 'android12-5.10.81_r00' into android12-5.10
bdc732d112f3 UPSTREAM: tracefs: Set all files to the same group ownership as the mount option
8455746a4564 UPSTREAM: tracefs: Have new files inherit the ownership of their parent
9c63be2adac9 UPSTREAM: tracefs: Have tracefs directories not set OTH permission bits by default
64095600fd53 Revert "ANDROID: vendor_hooks: Add hooks to recognize special worker thread."
7887091009b2 Revert "ANDROID: sysrq: add vendor hook for sysrq crash information"
63e7148b2729 Revert "ANDROID: user: Add vendor hook to user for GKI purpose"
18975040b944 Revert portions of "ANDROID: sched: Add vendor hooks for sched."
96c08d921060 Revert portions of "ANDROID: vendor_hooks: Add hooks for scheduler"
a32e89883a53 UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param

New functions/variables are now being tracked as well, that came from
the android12-5.10 branch:

Leaf changes summary: 5 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable

4 Added functions:

  [A] 'function int __traceiter_android_rvh_iommu_setup_dma_ops(void*, device*, u64, u64)'
  [A] 'function void* dma_alloc_noncoherent(device*, size_t, dma_addr_t*, dma_data_direction, gfp_t)'
  [A] 'function void dma_free_noncoherent(device*, size_t, void*, dma_addr_t, dma_data_direction)'
  [A] 'function void static_key_enable_cpuslocked(static_key*)'

1 Added variable:

  [A] 'tracepoint __tracepoint_android_rvh_iommu_setup_dma_ops'

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7a5a82681cc94f6b3dcd17e159da8976be0bcb78
tree: c01542e68a5c2510d814d1f42891e42fb39cb400
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. LICENSES/
  15. mm/
  16. net/
  17. samples/
  18. scripts/
  19. security/
  20. sound/
  21. tools/
  22. usr/
  23. virt/
  24. .clang-format
  25. .cocciconfig
  26. .get_maintainer.ignore
  27. .gitattributes
  28. .gitignore
  29. .mailmap
  30. build.config.aarch64
  31. build.config.allmodconfig
  32. build.config.allmodconfig.aarch64
  33. build.config.allmodconfig.arm
  34. build.config.allmodconfig.x86_64
  35. build.config.amlogic
  36. build.config.arm
  37. build.config.common
  38. build.config.db845c
  39. build.config.gki
  40. build.config.gki-debug.aarch64
  41. build.config.gki-debug.x86_64
  42. build.config.gki.aarch64
  43. build.config.gki.aarch64.fips140
  44. build.config.gki.aarch64.fips140_eval_testing
  45. build.config.gki.x86_64
  46. build.config.gki_kasan
  47. build.config.gki_kasan.aarch64
  48. build.config.gki_kasan.x86_64
  49. build.config.gki_kprobes
  50. build.config.gki_kprobes.aarch64
  51. build.config.gki_kprobes.x86_64
  52. build.config.hikey960
  53. build.config.khwasan
  54. build.config.rockchip
  55. build.config.x86_64
  56. COPYING
  57. CREDITS
  58. Kbuild
  59. Kconfig
  60. MAINTAINERS
  61. Makefile
  62. OWNERS
  63. README
  64. 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)