No description
  • C 98.2%
  • Assembly 1%
  • Makefile 0.3%
  • Shell 0.2%
  • Python 0.1%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Greg Kroah-Hartman 4aa66e99aa Merge branch 'android11-5.4' into 'android11-5.4-lts'
Sync up with android11-5.4 for the following commits:

8aa2c72ddf ANDROID: android/OWNERS: drop gki-abi-approvers@
9b465a062d ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS
884688fe0c ANDROID: Make vsock virtio packet buff size configurable
ae37e86392 ANDROID: refresh ABI XML to new version
35b7fe6c12 ANDROID: Refresh GKI ABI XML
d71d55b76b ANDROID: ABI: Update symbol list for cuttlefish
a5dc6e5d9e ANDROID: GKI: enable CONFIG_SONY_FF
e01b338f5e ANDROID: ABI: update symbols to unisoc whitelist to android11-k5.4
c9c1aa8cfe ANDROID: ABI: Update allowed list for QCOM
408366e170 ANDROID: GKI: Enable DRM_GEM_SHMEM_HELPER
a7c0b02b68 ANDROID: GKI: Update abi_gki_aarch64_qcom
4a669f5150 ANDROID: clang: update to 12.0.4
3c6774301d FROMGIT: configfs: fix a use-after-free in __configfs_open_file
b0cd259c16 ANDROID: GKI: enable hid-playstation driver/rumble
fb66b3f219 UPSTREAM: HID: playstation: add DualSense player LED support.
faff2c6cd8 UPSTREAM: HID: playstation: add microphone mute support for DualSense.
669066bd53 UPSTREAM: HID: playstation: add initial DualSense lightbar support.
6f239ba207 UPSTREAM: HID: playstation: fix array size comparison (off-by-one)
8e0061c2c3 UPSTREAM: HID: playstation: fix unused variable in ps_battery_get_property.
6c0bf9e6af BACKPORT: HID: playstation: report DualSense hardware and firmware version.
8d5f8d63af UPSTREAM: HID: playstation: add DualSense classic rumble support.
ea8ed83665 UPSTREAM: HID: playstation: add DualSense Bluetooth support.
3dd150cf16 UPSTREAM: HID: playstation: track devices in list.
a4a27b5d2a UPSTREAM: HID: playstation: add DualSense accelerometer and gyroscope support.
bd87612ff7 UPSTREAM: HID: playstation: add DualSense touchpad support.
f8e26f21e9 UPSTREAM: HID: playstation: add DualSense battery support.
69844f8c10 UPSTREAM: HID: playstation: use DualSense MAC address as unique identifier.
e694a1fc90 UPSTREAM: HID: playstation: initial DualSense USB support.
ce582b2960 ANDROID: GKI: Add IMX KMI symbol list
c6c9823ce8 BACKPORT: binder: move structs from core file to header file

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I066b0a352e06728856d725c3ef6bebb65bab8932
2021-04-10 11:51:05 +02:00
android Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
arch Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
block Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
certs certs: Fix blacklist flag type confusion 2021-03-04 10:26:29 +01:00
crypto Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
Documentation Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
drivers Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
fs Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
include Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
init Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
ipc Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions" 2020-05-29 14:48:37 +02:00
kernel Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
lib This is the 5.4.106 stable release 2021-03-17 17:55:32 +01:00
LICENSES
mm Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
net Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
samples This is the 5.4.106 stable release 2021-03-17 17:55:32 +01:00
scripts This is the 5.4.104 stable release 2021-03-09 11:24:14 +01:00
security This is the 5.4.109 stable release 2021-03-30 16:56:49 +02:00
sound This is the 5.4.110 stable release 2021-04-07 15:05:05 +02:00
tools Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-04-10 11:51:05 +02:00
usr initramfs: restore default compression behavior 2020-04-08 09:08:38 +02:00
virt KVM: arm64: Ensure I-cache isolation between vcpus of a same VM 2021-03-17 17:03:57 +01:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
build.config.aarch64 ANDROID: add compat cross compiler 2020-04-27 20:20:28 -07:00
build.config.allmodconfig ANDROID: GKI: Fix up "do not export symbol_get/put()" commit 2020-08-01 14:28:51 +02:00
build.config.allmodconfig.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.allmodconfig.arm ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.allmodconfig.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.arm
build.config.common ANDROID: clang: update to 12.0.4 2021-03-19 13:17:21 -07:00
build.config.db845c ANDROID: db845c: Use FRAGMENT_CONFIG 2021-03-08 19:14:48 +00:00
build.config.gki
build.config.gki-debug.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.gki-debug.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.gki.aarch64 ANDROID: GKI: Add IMX KMI symbol list 2021-03-10 20:18:36 +00:00
build.config.gki.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.gki_kasan ANDROID: build_config: drop CONFIG_KASAN_PANIC_ON_WARN 2021-02-15 18:29:03 +00:00
build.config.gki_kasan.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.gki_kasan.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.gki_kprobes ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-04 18:00:16 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-04 18:00:16 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-04 18:00:16 +00:00
build.config.hikey960 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-09-25 14:50:31 +08:00
build.config.x86_64
COPYING
CREDITS
Kbuild
Kconfig UPSTREAM: kbuild: ensure full rebuild when the compiler is updated 2020-09-24 10:02:38 +00:00
MAINTAINERS UPSTREAM: HID: playstation: initial DualSense USB support. 2021-03-12 17:11:35 -08:00
Makefile This is the 5.4.110 stable release 2021-04-07 15:05:05 +02:00
OWNERS ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS 2021-04-01 13:45:14 +00:00
README
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.

  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 ...) 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 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 ...) 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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [ 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
    • 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)