Go to file
Christoph Hellwig 24f685a927 UPSTREAM: block: add a rq_list type
Replace the semi-open coded request list helpers with a proper rq_list
type that mirrors the bio_list and has head and tail pointers.  Besides
better type safety this actually allows to insert at the tail of the
list, which will be useful soon.

Change-Id: Ia470736d0468c265f5b61cb9d8a0e5544b6b7b0d
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241113152050.157179-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bug: 415836627
(cherry picked from commit a3396b99990d8b4e5797e7b16fdeb64c15ae97bb)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2025-05-16 12:17:57 +00:00
arch ANDROID: KVM: arm64: Add smc64 trap handling for protected guests 2025-05-16 12:17:57 +00:00
block UPSTREAM: block: add a rq_list type 2025-05-16 12:17:57 +00:00
certs Revert "ANDROID: extract-cert: omit PKCS#11 support if building against BoringSSL" 2024-10-01 11:37:50 +00:00
crypto Merge 7d8dfc27d9 ("smb: client: Fix netns refcount imbalance causing leaks and use-after-free") into android16-6.12 2025-04-24 08:30:10 -07:00
Documentation UPSTREAM: fs/proc/task_mmu: add guard region bit to pagemap 2025-05-16 12:17:55 +00:00
drivers UPSTREAM: block: add a rq_list type 2025-05-16 12:17:57 +00:00
fs UPSTREAM: fs/proc/task_mmu: add guard region bit to pagemap 2025-05-16 12:17:55 +00:00
gki Reapply "ANDROID: enable memory allocation profiling configs" 2025-05-16 12:17:51 +00:00
include UPSTREAM: block: add a rq_list type 2025-05-16 12:17:57 +00:00
init FROMGIT: mm/memcg: move mem_cgroup_init() ahead of cgroup_init() 2025-05-14 08:39:46 -07:00
io_uring UPSTREAM: block: add a rq_list type 2025-05-16 12:17:57 +00:00
ipc ipc: fix memleak if msg_init_ns failed in create_ipc_ns 2024-12-05 14:03:02 +01:00
kernel ANDROID: Modify android_rvh_find_lowest_rq hook 2025-05-16 12:17:57 +00:00
lib Merge 7d8dfc27d9 ("smb: client: Fix netns refcount imbalance causing leaks and use-after-free") into android16-6.12 2025-04-24 08:30:10 -07:00
LICENSES LICENSES: add 0BSD license text 2024-09-01 20:43:24 -07:00
mm UPSTREAM: mm: allow guard regions in file-backed and read-only mappings 2025-05-16 12:17:54 +00:00
net UPSTREAM: wifi: cfg80211: fix out-of-bounds access during multi-link element defragmentation 2025-05-15 10:17:09 -07:00
rust Merge ca8bed31ed ("ksmbd: fix null pointer dereference in alloc_preauth_hash()") into android16-6.12 2025-04-29 09:21:46 -07:00
samples Merge 1ef4cf5f98 ("rust: alloc: update module comment of alloc.rs") into android16-6.12 2025-04-07 05:41:55 -07:00
scripts Merge ef79f2dec7 ("tracing: Correct the refcount if the hist/hist_debug file fails to open") into android16-6.12 2025-04-29 09:05:26 -07:00
security Merge 7d8dfc27d9 ("smb: client: Fix netns refcount imbalance causing leaks and use-after-free") into android16-6.12 2025-04-24 08:30:10 -07:00
sound ANDROID: GKI: the "reusachtig" padding sync with android16-6.12 2025-05-16 12:17:56 +00:00
tools UPSTREAM: tools/selftests: add guard region test for /proc/$pid/pagemap 2025-05-16 12:17:55 +00:00
usr kbuild: hdrcheck: fix cross build with clang 2025-03-13 13:02:18 +01:00
virt ANDROID: kvm/vfio: pviommu: Add set config IOCTL 2025-04-16 13:39:54 +00:00
.bazelignore ANDROID: add .bazelignore file 2025-02-11 14:36:14 -08:00
.clang-format clang-format: Update with v6.11-rc1's for_each macro list 2024-08-02 13:20:31 +02:00
.clippy.toml Merge 1ef4cf5f98 ("rust: alloc: update module comment of alloc.rs") into android16-6.12 2025-04-07 05:41:55 -07:00
.cocciconfig
.editorconfig .editorconfig: remove trim_trailing_whitespace option 2024-06-13 16:47:52 +02:00
.get_maintainer.ignore Add Jeff Kirsher to .get_maintainer.ignore 2024-03-08 11:36:54 +00:00
.gitattributes .gitattributes: set diff driver for Rust source code files 2023-05-31 17:48:25 +02:00
.gitignore Merge 1ef4cf5f98 ("rust: alloc: update module comment of alloc.rs") into android16-6.12 2025-04-07 05:41:55 -07:00
.mailmap mailmap: add entry for Thorsten Blum 2024-11-07 14:14:59 -08:00
.rustfmt.toml rust: add .rustfmt.toml 2022-09-28 09:02:20 +02:00
abi.bzl ANDROID: Use pkg_* instead of copy_file for kselftests. 2024-08-06 04:58:55 +00:00
BUILD.bazel ANDROID: Drop tests_zip_arm64 from TV target. 2025-05-12 11:13:47 -07:00
build.config.aarch64 ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
build.config.arm ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
build.config.common ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
build.config.constants ANDROID: 2025/04/30 KMI update 2025-04-30 14:45:47 +00:00
build.config.db845c ANDROID: db845c don't set __ANDROID_COMMON_KERNEL__. 2025-01-21 18:25:47 -08:00
build.config.gki ANDROID: GKI targets sets common_kernel.defconfig. 2024-10-24 21:58:18 +00:00
build.config.gki.aarch64 ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
build.config.gki.x86_64 ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
build.config.rockpi4 ANDROID: rockpi4 don't set __ANDROID_COMMON_KERNEL__. 2025-01-21 18:25:47 -08:00
build.config.x86_64 ANDROID: dissuade people from using some build configs. 2025-01-23 17:00:54 -08:00
COPYING
CREDITS MAINTAINERS: Remove self from DSA entry 2024-11-03 12:52:38 -08:00
Kbuild Kbuild updates for v6.1 2022-10-10 12:00:45 -07:00
Kconfig ANDROID: kbuild: add Kconfig support for external modules 2021-12-13 18:33:18 +00:00
Kconfig.ext ANDROID: kbuild: add Kconfig support for external modules 2021-12-13 18:33:18 +00:00
MAINTAINERS Merge 6.12.19 into android16-6.12 2025-04-17 03:02:04 -07:00
Makefile Merge 6.12.23 into android16-6.12 2025-04-29 11:52:22 -07:00
modules.bzl Revert "ANDROID: GKI: Enable CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT" 2025-04-30 13:43:32 +00:00
OWNERS ANDROID: Update OWNERS 2024-09-10 21:34:18 +00:00
OWNERS_DrNo ANDROID: Add isaacmanjarres to OWNERS_DrNo 2024-09-20 15:01:42 +00:00
README README: Fix spelling 2024-03-18 03:36:32 -06:00
README.md ANDROID: README.md: document FROMLIST not being allowed for rejected changes 2025-01-24 11:43:37 +00:00

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 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 scripts/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>
  • If a patch has been submitted to the community, but rejected, do NOT use the FROMLIST: tag to try to hide this fact. Use the ANDROID: tag as described below as this must be considered as an Android-specific submission, not an upstream submission as the community will not accept these changes as-is.

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)