Google Git
Sign in
android / kernel / common / 8a427269c016a4b7a6c29a595f3c121030649818
commit8a427269c016a4b7a6c29a595f3c121030649818[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Tue Jul 25 09:26:05 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Tue Jul 25 09:26:48 2023 +0000
tree6fa9400f88b7205411a15b69f6eb5130e5e936a3
parentd2debd8cf4f7ef6105839599d93a23da202dc7a2 [diff]
parentee5ff26eb7f5b4cd8874282267d48785d0868b70 [diff]
Merge branch 'android13-5.10' into branch 'android13-5.10-lts'

Catch up with some commits applied to the android13-5.10 branch that
adds new symbols to ensure that the ABI remains stable with LTS merges.

This merge contains the following commits:

* ee5ff26eb7f5 UPSTREAM: KVM: arm64: PMU: Restore the guest's EL0 event counting after migration
* 59b8fa4b8b60 UPSTREAM: kfence: avoid passing -g for test
* 0a01f8f17c19 UPSTREAM: Revert "kasan: drop skip_kasan_poison variable in free_pages_prepare"
* 6e6f92c6ddcc UPSTREAM: coresight: etm4x: Do not access TRCIDR1 for identification
* 2ce161a98d5c UPSTREAM: KVM: arm64: Limit length in kvm_vm_ioctl_mte_copy_tags() to INT_MAX
* 2366e84015c9 UPSTREAM: usb: typec: tcpm: fix warning when handle discover_identity message
* 54d2326d59cd ANDROID: set kmi_symbol_list_add_only for Kleaf builds.
* fb6a4e60e392 Merge tag 'android13-5.10.186_r00' into android13-5.10
* 054fa578544d FROMLIST: fuse: revalidate: don't invalidate if interrupted
* 095779598358 UPSTREAM: gfs2: Don't deref jdesc in evict
* 99685b94435b UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
* 9f44f81079d5 ANDROID: KVM: arm64: Fix MMU context save/restore over TLB invalidation
* 5a4d20a3eb4e ANDROID: Incremental fs: Allocate data buffer based on input request size
* f17cd56e4e42 BACKPORT: irqchip/gic-v3: Work around affinity issues on ASR8601
* 035e150e1af7 BACKPORT: irqchip/gic-v3: Improve affinity helper
* d1ad7188cc12 UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
* 50e27d9ce43b Revert "FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue"
* 08014c391c68 UPSTREAM: rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
* 10553f059d1a UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 4bf37318c19e UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
* d145f37a7a92 UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
* 93f6faa1d8fb UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 591de42137e4 UPSTREAM: io_uring: hold uring mutex around poll removal
* 50b2a0554173 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
* ac6253daf12a UPSTREAM: f2fs: fix to avoid use-after-free for cached IPU bio
* 1598ae202492 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
* b05ab3eb8ce2 UPSTREAM: Revert "Fix XFRM-I support for nested ESP tunnels"
* d359116c869e ANDROID: GKI: Add symbol list for telechips
* 6f19f8065e25 UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
* 7366d1515b86 FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue
* 26fdb5f5bfb6 ANDROID: fuse-bpf: Move FUSE_RELEASE to correct place
* 8be0098cad65 ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
* 424275e0e6ed ANDROID: GKI: rockchip: add symbols for some media/snd.
* f6df220888cc UPSTREAM: xfs: verify buffer contents when we skip log replay
* 93ca6372b1e9 UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
* ef103c358091 BACKPORT: btrfs: unset reloc control if transaction commit fails in prepare_to_relocate()
* 431595fc4b08 UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
* a366f6cd9826 ANDROID: GKI: rockchip: add symbols for pciexxx
* 8e8021e63e42 ANDROID: GKI: ASR: Update the ABI representation
* 6e1d82fcd778 ANDROID: HID; Over-ride default maximum buffer size when using UHID
* 4d9cc0c1eadb BACKPORT: FROMGIT: usb: core: add sysfs entry for usb device state
* 5991a94d3919 ANDROID: GKI: rockchip: Add symbols for ch341
* 31cdb217f127 UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
* 9abde55b5655 UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
* 75934d7a243f ANDROID: fuse-bpf: Ensure bpf field can never be nulled
* dbfab630772c UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
* 076a4937e71c ANDROID: sched/fair: unlink misfit from cpu overutilized
* c7a5e5c29dba UPSTREAM: 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
* 4d6ebe979f53 UPSTREAM: usb: gadget: uvc: queue empty isoc requests if no video buffer is available
* 666788c278f0 ANDROID: fix a race between speculative page walk and unmap operations
* 99c4f0739285 BACKPORT: mm: multi-gen LRU: retry pages written back while isolated

Change-Id: I9b42f1c080d3f3c8f79cc5b7ce10193c82cb6360
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 6fa9400f88b7205411a15b69f6eb5130e5e936a3
  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.gki
  43. build.config.gki-debug.aarch64
  44. build.config.gki-debug.x86_64
  45. build.config.gki.aarch64
  46. build.config.gki.aarch64.fips140
  47. build.config.gki.x86_64
  48. build.config.gki_kasan
  49. build.config.gki_kasan.aarch64
  50. build.config.gki_kasan.x86_64
  51. build.config.gki_kprobes
  52. build.config.gki_kprobes.aarch64
  53. build.config.gki_kprobes.x86_64
  54. build.config.hikey960
  55. build.config.khwasan
  56. build.config.rockchip
  57. build.config.rockpi4
  58. build.config.x86_64
  59. COPYING
  60. CREDITS
  61. Kbuild
  62. Kconfig
  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 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)