Kernel for Galaxy S24, rebased on CLO sources (WIP)
Go to file
Carlos Llamas 16c18c497d ANDROID: 6/16/2023 KMI update
Set KMI_GENERATION=10 for 6/16 KMI update

function symbol changed from 'int devm_gh_rm_register_platform_ops(struct device*, struct gh_rm_platform_ops*)' to 'int devm_gh_rm_register_platform_ops(struct device*, const struct gh_rm_platform_ops*)'
  CRC changed from 0xec193d82 to 0xe82ea1f9
  type changed from 'int(struct device*, struct gh_rm_platform_ops*)' to 'int(struct device*, const struct gh_rm_platform_ops*)'
    parameter 2 type changed from 'struct gh_rm_platform_ops*' to 'const struct gh_rm_platform_ops*'
      pointed-to type changed from 'struct gh_rm_platform_ops' to 'const struct gh_rm_platform_ops'
        qualifier const added

function symbol changed from 'int gh_rm_register_platform_ops(struct gh_rm_platform_ops*)' to 'int gh_rm_register_platform_ops(const struct gh_rm_platform_ops*)'
  CRC changed from 0xc34a7803 to 0xfd11885c
  type changed from 'int(struct gh_rm_platform_ops*)' to 'int(const struct gh_rm_platform_ops*)'
    parameter 1 type changed from 'struct gh_rm_platform_ops*' to 'const struct gh_rm_platform_ops*'
      pointed-to type changed from 'struct gh_rm_platform_ops' to 'const struct gh_rm_platform_ops'
        qualifier const added

function symbol changed from 'void gh_rm_unregister_platform_ops(struct gh_rm_platform_ops*)' to 'void gh_rm_unregister_platform_ops(const struct gh_rm_platform_ops*)'
  CRC changed from 0xc1f09d18 to 0x57f483b
  type changed from 'void(struct gh_rm_platform_ops*)' to 'void(const struct gh_rm_platform_ops*)'
    parameter 1 type changed from 'struct gh_rm_platform_ops*' to 'const struct gh_rm_platform_ops*'
      pointed-to type changed from 'struct gh_rm_platform_ops' to 'const struct gh_rm_platform_ops'
        qualifier const added

function symbol 'int ___pskb_trim(struct sk_buff*, unsigned int)' changed
  CRC changed from 0xb8fdf4c6 to 0x45b20f13

function symbol 'struct sk_buff* __alloc_skb(unsigned int, gfp_t, int, int)' changed
  CRC changed from 0x34355489 to 0x19dd35ba

function symbol 'void __balance_callbacks(struct rq*)' changed
  CRC changed from 0x76a1a2f4 to 0x2af1f39a

... 886 omitted; 889 symbols have only CRC changes

type 'struct hci_dev' changed
  byte size changed from 6416 to 6464
  member 'struct mutex unregister_lock' was added
  106 members ('struct work_struct cmd_sync_cancel_work' .. 'u64 android_kabi_reserved4') changed
    offset changed by 384

type 'struct sock' changed
  member 'int sk_wait_pending' was added

type 'struct xhci_driver_overrides' changed
  byte size changed from 64 to 120
  member 'int(* address_device)(struct usb_hcd*, struct usb_device*)' was added
  member 'int(* bus_suspend)(struct usb_hcd*)' was added
  member 'int(* bus_resume)(struct usb_hcd*)' was added
  member 'u64 android_kabi_reserved1' was added
  member 'u64 android_kabi_reserved2' was added
  member 'u64 android_kabi_reserved3' was added
  member 'u64 android_kabi_reserved4' was added

type 'struct pneigh_entry' changed
  member changed from 'u8 key[0]' to 'u32 key[0]'
    offset changed from 232 to 256
    type changed from 'u8[0]' to 'u32[0]'
      element type changed from 'u8' = '__u8' = 'unsigned char' to 'u32' = '__u32' = 'unsigned int'
        resolved type changed from 'unsigned char' to 'unsigned int'

type 'struct usb_udc' changed
  byte size changed from 952 to 1048
  member 'bool allow_connect' was added
  member 'struct work_struct vbus_work' was added
  member 'struct mutex connect_lock' was added

type 'struct sk_psock' changed
  byte size changed from 392 to 472
  member changed from 'struct work_struct work' to 'struct delayed_work work'
    offset changed from 2176 to 2112
    type changed from 'struct work_struct' to 'struct delayed_work'
  member 'struct rcu_work rwork' changed
    offset changed by 640

type 'struct netns_sysctl_ipv6' changed
  member changed from 'bool skip_notify_on_dev_down' to 'int skip_notify_on_dev_down'
    type changed from 'bool' = '_Bool' to 'int'
      resolved type changed from '_Bool' to 'int'
  member 'u8 fib_notify_on_flag_change' changed
    offset changed by 24

type 'struct sk_psock_work_state' changed
  byte size changed from 16 to 8
  member 'struct sk_buff* skb' was removed
  2 members ('u32 len' .. 'u32 off') changed
    offset changed by -64

Bug: 287162457
Change-Id: I438a8aa2c6a38dd5d575493b2735fe4d4403a971
Signed-off-by: Carlos Llamas <cmllamas@google.com>
2023-06-14 23:24:57 +00:00
android ANDROID: 6/16/2023 KMI update 2023-06-14 23:24:57 +00:00
arch ANDROID: virt: gunyah: Sync with latest Gunyah patches 2023-06-14 22:02:31 +00:00
block ANDROID: block: export tracepoints 2023-06-07 22:33:23 +00:00
certs This is the 6.1.11 stable release 2023-02-09 13:29:55 +00:00
crypto This is the 6.1.25 stable release 2023-04-26 13:13:19 +00:00
Documentation ANDROID: virt: gunyah: Sync with latest documentation and sample 2023-06-14 22:02:31 +00:00
drivers ANDROID: virt: gunyah: Sync with latest platform ops 2023-06-14 23:05:19 +00:00
fs UPSTREAM: mm: replace vma->vm_flags direct modifications with modifier calls 2023-06-07 14:24:57 +00:00
include ANDROID: virt: gunyah: Sync with latest platform ops 2023-06-14 23:05:19 +00:00
init UPSTREAM: gcc: disable '-Warray-bounds' for gcc-13 too 2023-05-16 17:26:14 +00:00
io_uring io_uring: fix memory leak when removing provided buffers 2023-04-13 16:55:31 +02:00
ipc ipc: fix memory leak in init_mqueue_fs() 2022-12-31 13:32:01 +01:00
kernel UPSTREAM: posix-cpu-timers: Implement the missing timer_wait_running callback 2023-06-14 16:40:59 +00:00
lib UPSTREAM: maple_tree: make maple state reusable after mas_empty_area() 2023-06-13 00:53:45 +00:00
LICENSES LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers 2021-12-16 14:33:10 +01:00
mm Revert "Revert "mm/mmap: regression fix for unmapped_area{_topdown}"" 2023-06-13 00:53:39 +00:00
net UPSTREAM: Bluetooth: fix debugfs registration 2023-06-14 23:02:42 +00:00
rust rust: kernel: Mark rust_fmt_argument as extern "C" 2023-04-26 14:28:38 +02:00
samples ANDROID: virt: gunyah: Sync with latest documentation and sample 2023-06-14 22:02:31 +00:00
scripts BACKPORT: arm64: unwind: add asynchronous unwind tables to kernel and modules 2023-05-25 15:37:14 -07:00
security UPSTREAM: mm: replace vma->vm_flags direct modifications with modifier calls 2023-06-07 14:24:57 +00:00
sound ANDROID: sound: usb: Add vendor's hooking interface 2023-06-14 23:02:42 +00:00
tools FROMGIT: maple_tree: avoid unnecessary ascending 2023-06-06 20:05:25 +00:00
usr usr/gen_init_cpio.c: remove unnecessary -1 values from int file 2022-10-03 14:21:44 -07:00
virt KVM: Register /dev/kvm as the _very_ last thing during initialization 2023-03-10 09:34:11 +01:00
.clang-format inet: ping: use hlist_nulls rcu iterator during lookup 2022-12-01 12:42:46 +01:00
.cocciconfig
.get_maintainer.ignore get_maintainer: add Alan to .get_maintainer.ignore 2022-08-20 15:17:44 -07:00
.gitattributes .gitattributes: use 'dts' diff driver for dts files 2019-12-04 19:44:11 -08:00
.gitignore Kbuild: add Rust support 2022-09-28 09:02:20 +02:00
.mailmap 9 hotfixes. 6 for MM, 3 for other areas. Four of these patches address 2022-12-10 17:10:52 -08:00
.rustfmt.toml rust: add .rustfmt.toml 2022-09-28 09:02:20 +02:00
BUILD.bazel ANDROID: GKI: update symbol list file for honor 2023-05-17 21:26:09 +00:00
build.config.aarch64 ANDROID: Move NDK_TRIPLE to build.config.constants. 2023-02-14 14:13:51 -08:00
build.config.allmodconfig ANDROID: Disable AF_RXRPC for allmodconfig. 2023-03-15 14:09:33 +00:00
build.config.allmodconfig.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.arm ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.amlogic ANDROID: Unnest MAKE_GOALS from build configs 2023-05-02 13:37:21 +00:00
build.config.arm ANDROID: kleaf: move NDK_TRIPLE for arm to build.config.constants. 2023-05-09 22:36:11 +00:00
build.config.common ANDROID: 6/16/2023 KMI update 2023-06-14 23:24:57 +00:00
build.config.constants ANDROID: clang: update to 17.0.2 2023-05-15 18:53:36 +00:00
build.config.db845c ANDROID: db845c: Remove MAKE_GOALS from build.config 2023-05-15 07:01:39 +00:00
build.config.gki ANDROID: GKI: Source GKI_BUILD_CONFIG_FRAGMENT after setting all variables 2022-12-27 13:52:08 -08:00
build.config.gki_kasan ANDROID: build.config: re-disable LTO properly for KASAN 2022-03-24 12:41:35 -07:00
build.config.gki_kasan.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kasan.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kprobes ANDROID: build.configs: migrate away from CC_LD_ARG 2021-07-02 09:49:23 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki-debug.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki-debug.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki.aarch64 ANDROID: GKI: Remove MAKE_GOALS from build.config 2023-05-10 17:05:37 +00:00
build.config.gki.aarch64.16k ANDROID: 16k target: don't write defconfig to source tree 2022-10-03 11:24:35 -07:00
build.config.gki.aarch64.fips140 ANDROID: fips140: add kernel crypto module 2023-01-09 21:33:43 +00:00
build.config.gki.riscv64 ANDROID: GKI: Remove MAKE_GOALS from build.config 2023-05-10 17:05:37 +00:00
build.config.gki.x86_64 ANDROID: GKI: Source GKI_BUILD_CONFIG_FRAGMENT after setting all variables 2022-12-27 13:52:08 -08:00
build.config.khwasan ANDROID: Add a build config fragment for KHWASan. 2021-10-13 19:44:44 +00:00
build.config.riscv64 ANDROID: GKI: Add 64-bit RISC-V config 2022-12-08 20:01:15 +00:00
build.config.rockpi4 ANDROID: db845c: Remove MAKE_GOALS from build.config 2023-05-15 07:01:39 +00:00
build.config.x86_64 ANDROID: Move NDK_TRIPLE to build.config.constants. 2023-02-14 14:13:51 -08:00
COPYING COPYING: state that all contributions really are covered by this file 2020-02-10 13:32:20 -08:00
CREDITS MAINTAINERS: Remove Michal Marek from Kbuild maintainers 2022-11-16 14:53:00 +09: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 ANDROID: Revert "mm: remove cleancache" 2023-04-26 17:01:50 +00:00
Makefile UPSTREAM: scs: add support for dynamic shadow call stacks 2023-05-25 15:37:14 -07:00
modules.bzl ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig. 2023-06-12 08:25:19 +00:00
OWNERS ANDROID: add smuckle to OWNERS 2022-06-18 10:41:40 -07:00
OWNERS_DrNo ANDROID: Updating OWNERS_DrNo 2022-08-22 16:34:52 +00:00
README Drop all 00-INDEX files from Documentation/ 2018-09-09 15:08:58 -06:00
README.md ANDROID: README.md: fix checkpatch.pl path typo 2021-04-07 23:16:50 +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 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>

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)