Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / kernel / shift / mainline / bc9699030e0d0512f5f1912075f5abb12a3035e6
commitbc9699030e0d0512f5f1912075f5abb12a3035e6[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Wed Jun 30 15:26:35 2021 +0200
committerGreg Kroah-Hartman <gregkh@google.com>Wed Jun 30 15:34:53 2021 +0200
tree37f4e5bda4c515384cf72e81f27ba101ceadbecb
parent76d56081355e70b9a7e8cabfa72153f106ca4a79 [diff]
parentde1a0ea81182525e905d2bb1924a42da51357571 [diff]
Merge branch 'android12-5.10' into `android12-5.10-lts`

Sync up with android12-5.10 for the following commits:

de1a0ea81182 ANDROID: logbuf: Remove if directive for vendor hooks
3b6916b4d499 ANDROID: iommu/io-pgtable-arm: Add IOMMU_CACHE_ICACHE_OCACHE_NWA
2e289f3641a9 FROMGIT: mac80211_hwsim: add concurrent channels scanning support over virtio
5b1baee639f3 ANDROID: GKI: update allowed symbols for exynosauto soc
961be311783c ANDROID: GKI: initial upload list for exynosauto soc
01f2392e13db ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont()
3cd04ea95afb ANDROID: lib: Export show_mem() for vendor module usage
ba085dd70a3f FROMLIST: remoteproc: core: Export the rproc coredump APIs
1093a9bfdbd2 ANDROID: sched: select fallback rq must check for allowed cpus
8943a2e7a33e ANDROID: android: Export symbols for invoking cpufreq_update_util()
e7cf28a1a416 ANDROID: Update symbol list for mtk
c6857771051a ANDROID: kernel: add module info for debug_kinfo
ea53c24cb060 FROMGIT: bpf: Do not change gso_size during bpf_skb_change_proto()
b007e43692c4 FROMGIT: mm: slub: fix the leak of alloc/free traces debugfs interface
850f11aa85f0 Revert "KMI: BACKPORT: FROMGIT: scsi: ufs: Optimize host lock on transfer requests send/compl paths"
46575badbb52 Revert "BACKPORT: FROMGIT: scsi: ufs: Optimize host lock on transfer requests send/compl paths"
83d653257a55 Revert "FROMGIT: scsi: ufs: Utilize Transfer Request List Completion Notification Register"
9f8f2ea03ede ANDROID: power: wakeup_reason: change abort log
d5a092726b54 ANDROID: GKI: Update abi_gki_aarch64_qcom list for rwsem list add
eabe9707f264 ANDROID: Add hook to show vendor info for transactions
12902c999623 ANDROID: vendor_hooks: Export direct reclaim trace points
cea24faf9868 ANDROID: Update the ABI representation
c0e8aae5c521 ANDROID: qcom: Add xfrm and skb related symbols
8102df91f2ab Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
b70055f85a96 ANDROID: iommu: Revise vendor hook param for iova free tracking
a985701859e4 ANDROID: abi_gki_aarch64_qcom: Add additional symbols for 32bit execve
c7c351ab3f6e ANDROID: sched: add restricted tracehooks for 32bit execve
f502bc761ac2 ANDROID: GKI: Update symbols to symbol list
4198bdb2cff8 ANDROID: coresight: Update ETE DT yaml file
6f1bd7583f13 ANDROID: coresight: Update ETE/TRBE to v6 merged upstream
ce71010347a0 ANDROID: kvm: arm64: Clarify the comment for SPE save context
ee7e80c81bb7 BACKPORT: arm64: KVM: Enable access to TRBE support for host
b6b0927eacc2 BACKPORT: KVM: arm64: Move SPE availability check to VCPU load
dde40c10899c UPSTREAM: KVM: arm64: Handle access to TRFCR_EL1
ee682ec7667a ANDROID: GKI: Enable ARCH_SPRD and SPRD_TIMER
39147716e824 UPSTREAM: x86, lto: Pass -stack-alignment only on LLD < 13.0.0
7d3618b8b9f6 ANDROID: fix permission error of page_pinner
cfe1f5aea680 ANDROID: gki_config: disable per-cgroup pressure tracking
c7186c2c46d8 FROMGIT: cgroup: make per-cgroup pressure stall tracking configurable
0d054fc5d777 Revert "ANDROID: make per-cgroup PSI tracking configurable"
951bdfd077db FROMLIST: arm: Mark the recheduling IPI as raw interrupt
42f775df7290 FROMLIST: arm64: Mark the recheduling IPI as raw interrupt
3f9d45d8021d FROMLIST: genirq: Allow an interrupt to be marked as 'raw'
08327b90075e FROMLIST: genirq: Add __irq_modify_status() helper to clear/set special flags
77c9f446b68c ANDROID: GKI: Update abi_gki_aarch64_qcom list for shmem allocations
728626cb04aa ANDROID: power: Add vendor hook to qos for GKI purpose.
9d55580966da ANDROID: selinux: modify RTM_GETNEIGH{TBL}
bb51a331824e Revert "f2fs: avoid attaching SB_ACTIVE flag during mount/remount"
c81ac64da10f f2fs: remove false alarm on iget failure during GC
cdeff03989ba f2fs: enable extent cache for compression files in read-only
15a475975ec9 f2fs: fix to avoid adding tab before doc section
44e0be85eb6b f2fs: introduce f2fs_casefolded_name slab cache
eaef955b91d1 f2fs: swap: support migrating swapfile in aligned write mode
34c703ff0470 f2fs: swap: remove dead codes
ec3ea14d2fd3 f2fs: compress: add compress_inode to cache compressed blocks
d90505e519ac f2fs: clean up /sys/fs/f2fs/<disk>/features
95f2afc02d37 f2fs: add pin_file in feature list
d8755821c438 f2fs: Advertise encrypted casefolding in sysfs
7004c47db2b6 f2fs: Show casefolding support only when supported
832ee332626a f2fs: support RO feature
b5a393c8a8d1 f2fs: logging neatening

Change-Id: I42f9108240ebf0d1e75b5d2ee24644cb995f8b3c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 37f4e5bda4c515384cf72e81f27ba101ceadbecb
  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.x86_64
  45. build.config.gki_kasan
  46. build.config.gki_kasan.aarch64
  47. build.config.gki_kasan.x86_64
  48. build.config.gki_kprobes
  49. build.config.gki_kprobes.aarch64
  50. build.config.gki_kprobes.x86_64
  51. build.config.hikey960
  52. build.config.khwasan
  53. build.config.x86_64
  54. COPYING
  55. CREDITS
  56. Kbuild
  57. Kconfig
  58. MAINTAINERS
  59. Makefile
  60. OWNERS
  61. README
  62. 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)