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 3a7a77d783 Merge branch 'android11-5.4' into 'android11-5.4-lts'
Sync up with android11-5.4 for the following commits:

051373292b ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC
55cb12f0f8 ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure
59d8264680 ANDROID: f2fs: fix potential deadlock by android ftrace
dc8c919ca6 ANDROID: GKI: Update FCNT KMI symbol list No new symbols added that are not already in the .xml file.
e3f12f4239 ANDROID: GKI : Update symbols to symbol list
47c8de47e1 BACKPORT: crypto: arch - conditionalize crypto api in arch glue for lib code
514e31d6a1 BACKPORT: crypto: arch/lib - limit simd usage to 4k chunks
568c0c89d9 UPSTREAM: crypto: arm/blake2s - fix for big endian
ce6e69838c ANDROID: gki_defconfig: enable BLAKE2b support
40501f7350 BACKPORT: crypto: arm/blake2b - add NEON-accelerated BLAKE2b
477000061d BACKPORT: crypto: blake2b - update file comment
c5816192fd BACKPORT: crypto: blake2b - sync with blake2s implementation
be7d8de428 UPSTREAM: crypto: arm/blake2s - add ARM scalar optimized BLAKE2s
d63d7c1ee0 UPSTREAM: crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
b8de6b8e2c UPSTREAM: crypto: blake2s - adjust include guard naming
609d9425fa UPSTREAM: crypto: blake2s - add comment for blake2s_state fields
32ac79b096 UPSTREAM: crypto: blake2s - optimize blake2s initialization
74c75891bd BACKPORT: crypto: blake2s - share the "shash" API boilerplate code
8a14e1d839 UPSTREAM: crypto: blake2s - move update and final logic to internal/blake2s.h
4c7a6f464d UPSTREAM: crypto: blake2s - remove unneeded includes
7537c64845 UPSTREAM: crypto: x86/blake2s - define shash_alg structs using macros
b54930b350 UPSTREAM: crypto: blake2s - define shash_alg structs using macros
05e10b45ed UPSTREAM: crypto: lib/blake2s - Move selftest prototype into header file
29ab2a5781 UPSTREAM: crypto: blake2b - Fix clang optimization for ARMv7-M
27c00daf70 UPSTREAM: crypto: blake2b - rename tfm context and _setkey callback
196f7b5134 UPSTREAM: crypto: blake2b - merge _update to api callback
a623362717 UPSTREAM: crypto: blake2b - open code set last block helper
00e77739a2 UPSTREAM: crypto: blake2b - delete unused structs or members
f03f8096dc UPSTREAM: crypto: blake2b - simplify key init
fdb0b24608 UPSTREAM: crypto: blake2b - merge blake2 init to api callback
75973ecd9d UPSTREAM: crypto: blake2b - merge _final implementation to callback
fbbe069bbb BACKPORT: crypto: testmgr - add test vectors for blake2b
9cd856934e BACKPORT: crypto: blake2b - add blake2b generic implementation
3e82f8af26 UPSTREAM: crypto: blake2s - x86_64 SIMD implementation
22bff7a3f6 UPSTREAM: crypto: blake2s - implement generic shash driver
43ec9b95a3 UPSTREAM: crypto: testmgr - add test cases for Blake2s
192edcb3df UPSTREAM: crypto: blake2s - generic C library implementation and selftest
078cebb3f5 UPSTREAM: crypto: lib - tidy up lib/crypto Kconfig and Makefile
160ab93103 ANDROID: ion heap: init ion heaps in subsys_initcall

Change-Id: I3a9e13098b73ae21ea76d95c75572c124bd91cfd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2021-11-02 15:04:50 +01:00
android ANDROID: GKI: Update FCNT KMI symbol list 2021-10-26 06:44:58 +00:00
arch Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-11-02 15:04:50 +01:00
block This is the 5.4.151 stable release 2021-10-06 15:51:50 +02:00
certs
crypto BACKPORT: crypto: blake2b - update file comment 2021-10-23 19:32:26 -07:00
Documentation
drivers Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-11-02 15:04:50 +01:00
fs Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-11-02 15:04:50 +01:00
include Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-11-02 15:04:50 +01:00
init
ipc
kernel This is the 5.4.153 stable release 2021-10-13 10:58:45 +02:00
lib Merge branch 'android11-5.4' into 'android11-5.4-lts' 2021-11-02 15:04:50 +01:00
LICENSES
mm
net This is the 5.4.155 stable release 2021-10-20 12:35:49 +02:00
samples
scripts This is the 5.4.155 stable release 2021-10-20 12:35:49 +02:00
security Merge tag 'android11-5.4.147_r00' android11-5.4 2021-10-20 10:32:16 +02:00
sound This is the 5.4.155 stable release 2021-10-20 12:35:49 +02:00
tools This is the 5.4.152 stable release 2021-10-09 14:57:08 +02:00
usr
virt KVM: do not shrink halt_poll_ns below grow_start 2021-10-09 14:39:50 +02:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
build.config.aarch64 ANDROID: distribute Module.symvers 2021-10-14 13:14:46 +08:00
build.config.allmodconfig ANDROID: Different fix for KABI breakage in 5.4.151 in struct sock 2021-10-12 18:21:21 +02:00
build.config.allmodconfig.aarch64
build.config.allmodconfig.arm
build.config.allmodconfig.x86_64
build.config.arm
build.config.common
build.config.db845c
build.config.gki
build.config.gki-debug.aarch64
build.config.gki-debug.x86_64
build.config.gki.aarch64
build.config.gki.x86_64
build.config.gki_kasan
build.config.gki_kasan.aarch64
build.config.gki_kasan.x86_64
build.config.gki_kprobes
build.config.gki_kprobes.aarch64
build.config.gki_kprobes.x86_64
build.config.hikey960
build.config.x86_64 ANDROID: distribute Module.symvers 2021-10-14 13:14:46 +08:00
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile This is the 5.4.155 stable release 2021-10-20 12:35:49 +02:00
OWNERS
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)