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

d8789c9d2e Merge tag 'android11-5.4.180_r00' into android11-5.4
e12150c5be UPSTREAM: usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
9f9386182f UPSTREAM: usb: gadget: rndis: prevent integer overflow in rndis_set_response()
09809e2b27 UPSTREAM: fixup for "arm64 entry: Add macro for reading symbol address from the trampoline"
194240faf6 UPSTREAM: arm64: Use the clearbhb instruction in mitigations
4900c32514 UPSTREAM: KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
18ee502110 UPSTREAM: arm64: Mitigate spectre style branch history side channels
f734ff58b6 UPSTREAM: KVM: arm64: Add templates for BHB mitigation sequences
66ef49ca32 UPSTREAM: arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2
36b454a8d4 UPSTREAM: arm64: Add percpu vectors for EL1
df875dc844 UPSTREAM: arm64: entry: Add macro for reading symbol addresses from the trampoline
a04f5e2607 UPSTREAM: arm64: entry: Add vectors that have the bhb mitigation sequences
e545c71992 UPSTREAM: arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
ef5fb0f94d UPSTREAM: arm64: entry: Allow the trampoline text to occupy multiple pages
363341f5bf UPSTREAM: arm64: entry: Make the kpti trampoline's kpti sequence optional
25cd0ee5ae UPSTREAM: arm64: entry: Move trampoline macros out of ifdef'd section
41285e5a05 UPSTREAM: arm64: entry: Don't assume tramp_vectors is the start of the vectors
f1529317ea UPSTREAM: arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
52e174ea59 UPSTREAM: arm64: entry: Move the trampoline data page before the text page
491224d402 UPSTREAM: arm64: entry: Free up another register on kpti's tramp_exit path
0955db3b69 UPSTREAM: arm64: entry: Make the trampoline cleanup optional
289accc54c UPSTREAM: arm64: entry.S: Add ventry overflow sanity checks
990f43d447 UPSTREAM: arm64: Add Cortex-X2 CPU part definition
a08470635c UPSTREAM: arm64: add ID_AA64ISAR2_EL1 sys register
473d08011d UPSTREAM: arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
b1c011e721 UPSTREAM: arm64: Add part number for Arm Cortex-A77
7d1d2de33e UPSTREAM: sctp: fix the processing for INIT chunk
b94d6fe4ce ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
6cfc86a0f8 UPSTREAM: ARM: fix Thumb2 regression with Spectre BHB
e491469b29 UPSTREAM: ARM: Spectre-BHB: provide empty stub for non-config
383c8eb200 UPSTREAM: ARM: fix build warning in proc-v7-bugs.c
244fecd055 UPSTREAM: ARM: Do not use NOCROSSREFS directive with ld.lld
33ecfe789b UPSTREAM: ARM: fix co-processor register typo
a25723033c UPSTREAM: ARM: fix build error when BPF_SYSCALL is disabled
dc0445910f UPSTREAM: ARM: include unprivileged BPF status in Spectre V2 reporting
9ff274f531 UPSTREAM: ARM: Spectre-BHB workaround
21e0a096a0 UPSTREAM: ARM: use LOADADDR() to get load address of sections
0013389a4f UPSTREAM: ARM: early traps initialisation
3aa8448c5d UPSTREAM: ARM: report Spectre v2 status through sysfs
57927cab04 UPSTREAM: arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit()
123e80fe59 UPSTREAM: arm/arm64: Provide a wrapper for SMCCC 1.1 calls
398beb5677 UPSTREAM: x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT
c8803feb8c UPSTREAM: x86/speculation: Warn about Spectre v2 LFENCE mitigation
69aa4eee4d UPSTREAM: x86/speculation: Update link to AMD speculation whitepaper
9ad2b9b20f UPSTREAM: x86/speculation: Use generic retpoline by default on AMD
4e9fffdc89 UPSTREAM: x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting
4318c0c64f UPSTREAM: Documentation/hw-vuln: Update spectre doc
b9eb6a3cb2 UPSTREAM: x86/speculation: Add eIBRS + Retpoline options
f86fd59049 UPSTREAM: x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE
0b8fa4c67e UPSTREAM: x86,bugs: Unconditionally allow spectre_v2=retpoline,amd
951cd7f645 UPSTREAM: x86/speculation: Merge one test in spectre_v2_user_select_mitigation()
508711cf30 UPSTREAM: bpf: Add kconfig knob for disabling unpriv bpf by default
2aea7dc18f UPSTREAM: mmc: block: fix read single on recovery logic
5d7a491ae4 UPSTREAM: lib/iov_iter: initialize "flags" in new pipe_buffer
88e1302769 Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount"
2b144ea90c Revert "ANDROID: incremental-fs: fix mount_fs issue"
46778c889e FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file
9a4b39bd76 UPSTREAM: usb: gadget: rndis: check size of RNDIS_MSG_SET command
0d1f1d4375 UPSTREAM: USB: gadget: validate interface OS descriptor requests
f5fe46103f Revert "tracefs: Have tracefs directories not set OTH permission bits by default"
717add4ec8 UPSTREAM: tipc: improve size validations for received domain records

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8f950d67b05ff95523e4a59f59ed6a376f2ad674
2022-03-21 16:18:49 +01:00
android Merge branch 'android11-5.4' into 'android11-5.4-lts' 2022-02-11 16:21:49 +01:00
arch Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
block This is the 5.4.183 stable release 2022-03-12 13:48:22 +01:00
certs
crypto This is the 5.4.160 stable release 2021-11-17 10:19:21 +01:00
Documentation Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
drivers Merge branch 'android11-5.4' into 'android11-5.4-lts' 2022-03-21 16:18:49 +01:00
fs Merge branch 'android11-5.4' into 'android11-5.4-lts' 2022-03-21 16:18:49 +01:00
include Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
init UPSTREAM: bpf: Add kconfig knob for disabling unpriv bpf by default 2022-03-14 12:47:00 +01:00
ipc shm: extend forced shm destroy to support objects from several IPC nses 2021-12-01 09:23:35 +01:00
kernel Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
lib Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
LICENSES
mm This is the 5.4.183 stable release 2022-03-12 13:48:22 +01:00
net Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
samples This is the 5.4.160 stable release 2021-11-17 10:19:21 +01:00
scripts This is the 5.4.181 stable release 2022-02-23 12:17:54 +01:00
security This is the 5.4.180 stable release 2022-02-16 17:17:22 +01:00
sound This is the 5.4.183 stable release 2022-03-12 13:48:22 +01:00
tools Merge tag 'android11-5.4.180_r00' into android11-5.4 2022-03-21 12:44:03 +01:00
usr
virt KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated 2022-03-19 13:40:15 +01: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.186 stable release 2022-03-19 14:08:03 +01: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)