Google Git
Sign in
android / kernel / common / 0da9a7bcb7a258399e414fad32846139a47e3698
commit0da9a7bcb7a258399e414fad32846139a47e3698[log] [tgz]
authorGreg Kroah-Hartman <[email protected]>Wed Nov 29 14:52:00 2023 +0000
committerGreg Kroah-Hartman <[email protected]>Wed Nov 29 14:53:02 2023 +0000
treeb53275859716880c0643b7f3043806b099dbabff
parentbe0b36498b49e50de89d7b548323e1b8c77fc00a [diff]
parentb9ea98aa2fd47cd8af31bb674d2de84d09251e09 [diff]
Merge branch 'android13-5.10' into branch 'android13-5.10-lts'

This catches up the android13-5.10-lts branch with the latest changes in
the android13-5.10 branch.

Included in here are the following commits:

b9ea98aa2fd4 Merge tag 'android13-5.10.198_r00' into android13-5.10
4b762cfed1b5 UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
009e0759de91 UPSTREAM: USB: core: Change usb_get_device_descriptor() API
94f4edeb9ede UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads
05b3d87748ae UPSTREAM: tcp: Reduce chance of collisions in inet6_hashfn().
109fb9c389ee ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
60a94adfc6f5 FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
5f10cc76ad88 FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
e3b1bba1e757 FROMGIT: usb: gadget: uvc: move video disable logic to its own function
f7f5e854de58 FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
86d2f598a321 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
d397cc29e040 FROMGIT: Input: uinput - allow injecting event times
2f022cc69a84 ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort()
47e30b4060c4 ANDROID: fs/passthrough: Fix compatibility with R/O file system
2fea3eca9608 ANDROID: Update the ABI representation
0c3d53615a2a UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
f8548bcb8455 BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
575177ced7a8 BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
2d63cfb6443a UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
de5c447459e9 UPSTREAM: usb: gadget: function: Remove unused declarations
3dc517bb4d91 UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump

Change-Id: I270f2758873cf0c514cae9a63292a1a8457d79ef
Signed-off-by: Greg Kroah-Hartman <[email protected]>
tree: b53275859716880c0643b7f3043806b099dbabff
  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 [email protected]. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

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 <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <[email protected]>

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 <[email protected]>
  • 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 <[email protected]>

        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 <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/[email protected]/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <[email protected]>

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 <[email protected]>
  • 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)