Linux kernel for uConsole
Find a file
Greg Kroah-Hartman 0e8dfc1216 Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Sync up with android12-5.10 for the following commits:

5545801f5c ANDROID: abi_gki_aarch64_qcom: Add android_vh_madvise_cold_or_pageout
d195c9f2bb ANDROID: force struct page_vma_mapped_walk to be defined in KMI
464a3706e6 Merge "Merge tag 'android12-5.10.136_r00' into android12-5.10" into android12-5.10
18cd39b706 Merge tag 'android12-5.10.136_r00' into android12-5.10
6d04d8ce90 ANDROID: vendor_hooks: Allow shared pages reclaim via MADV_PAGEOUT
2d8afda40e UPSTREAM: usb: gadget: mass_storage: Fix cdrom data transfers on MAC-OS
4135365b5d ANDROID: GKI: Update symbols to symbol list
c6f7a0ebd8 ANDROID: make sure all types for hooks are defined in KMI
b9ac329a83 ANDROID: force struct selinux_state to be defined in KMI
b71060e6eb BACKPORT: erofs: fix use-after-free of on-stack io[]
ecf5583fc7 ANDROID: GKI: Update symbols to symbol list
5c5b7a4da6 ANDROID: vendor_hook: rename the the name of hooks
2c625a20c0 ANDROID: ABI: Add extcon_get_property_capability symbol
72b1f9fd16 Revert "ANDROID: arm64: debug-monitors: export break hook APIs"
cc51dcbc60 Revert "ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath."
9072e986bd Revert "ANDROID: Export functions to be used with dma_map_ops in modules"
2fc96f32ee FROMLIST: f2fs: let FI_OPU_WRITE override FADVISE_COLD_BIT
06b301069f ANDROID: remove unused xhci_get_endpoint_address export
bcf6dddd97 ANDROID: incfs: Add check for ATTR_KILL_SUID and ATTR_MODE in incfs_setattr
d915364e92 ANDROID: GKI: Update symbols to symbol list
db2516ff46 ANDROID: vendor_hooks: Add hooks for lookaround
feedd14d14 Revert "Revert "ANDROID: add for tuning readahead size""
9252f4d58b ANDROID: transsion: Update the ABI xml and symbol list
f50f24e781 ANDROID: vendor_hooks: Add hooks for lookaround
c762f435c0 BACKPORT: dm verity: set DM_TARGET_IMMUTABLE feature flag
2bd9e6cddc BACKPORT: pipe: Fix missing lock in pipe_resize_ring()
d7586fa209 BACKPORT: KVM: x86: avoid calling x86 emulator without a decoded instruction
cee231f83b ANDROID: GKI: add symbols in android/abi_gki_aarch64_oplus
8aaba3c5a1 BACKPORT: watchqueue: make sure to serialize 'wqueue->defunct' properly
7351343bc8 ANDROID: GKI: Update symbol list for Exynos SoC
9527907814 UPSTREAM: usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop
bda2986f13 UPSTREAM: usb: typec: ucsi: Acknowledge the GET_ERROR_STATUS command completion
eef3b6ff41 BACKPORT: scsi: ufs: core: Increase fDeviceInit poll frequency
eaa7364bf7 FROMGIT: f2fs: increase the limit for reserve_root
42aa1955c2 FROMGIT: f2fs: complete checkpoints during remount
1c5313a9f7 FROMGIT: f2fs: flush pending checkpoints when freezing super
604f2f5656 BACKPORT: f2fs: don't get FREEZE lock in f2fs_evict_inode in frozen fs
594835143a BACKPORT: f2fs: introduce F2FS_IPU_HONOR_OPU_WRITE ipu policy
85aff72329 Revert "ANDROID: GKI: signal: Export for __lock_task_sighand"
22b447e9bd BACKPORT: f2fs: invalidate meta pages only for post_read required inode
fa0cdb5b9d BACKPORT: f2fs: fix to invalidate META_MAPPING before DIO write
2301307412 BACKPORT: f2fs: invalidate META_MAPPING before IPU/DIO write
99f0160022 ANDROID: mm: page_pinner: use page_ext_get/put() to work with page_ext
2b3f9b8187 FROMLIST: mm: fix use-after free of page_ext after race with memory-offline
dec2f52d08 ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.
bc08447eb7 ANDROID: GKI: rockchip: add symbol netif_set_xps_queue
3f90d4f1f3 ANDROID: GKI: Update symbol list
7b0822a261 Revert "ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup"
425c0f18ed ANDROID: Fix a build warning inside early_memblock_nomap
84a0d243b6 ANDROID: mm/memory_hotplug: Fix error path handling
98e5fb34d1 Revert "ANDROID: add for tuning readahead size"
486580ffb5 Revert "ANDROID: vendor_hooks: Add hooks for mutex"

Update the .xml file to add the following new symbols that were now
started to be tracked in the android12-5.10 branch:

Leaf changes summary: 40 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 1 Removed, 0 Changed, 18 Added functions
Removed/Changed/Added variables summary: 1 Removed, 0 Changed, 20 Added variables

1 Removed function:

  [D] 'function int __traceiter_android_vh_record_percpu_rwsem_lock_starttime(void*, task_struct*, unsigned long int)'

18 Added functions:

  [A] 'function void __page_frag_cache_drain(page*, unsigned int)'
  [A] 'function int __traceiter_android_vh_check_page_look_around_ref(void*, page*, int*)'
  [A] 'function int __traceiter_android_vh_do_futex(void*, int, unsigned int*, u32*)'
  [A] 'function int __traceiter_android_vh_futex_wait_end(void*, unsigned int, u32)'
  [A] 'function int __traceiter_android_vh_futex_wait_start(void*, unsigned int, u32)'
  [A] 'function int __traceiter_android_vh_futex_wake_this(void*, int, int, int, task_struct*)'
  [A] 'function int __traceiter_android_vh_futex_wake_traverse_plist(void*, plist_head*, int*, futex_key, u32)'
  [A] 'function int __traceiter_android_vh_futex_wake_up_q_finish(void*, int, int)'
  [A] 'function int __traceiter_android_vh_look_around(void*, page_vma_mapped_walk*, page*, vm_area_struct*, int*)'
  [A] 'function int __traceiter_android_vh_look_around_migrate_page(void*, page*, page*)'
  [A] 'function int __traceiter_android_vh_ra_tuning_max_page(void*, readahead_control*, unsigned long int*)'
  [A] 'function int __traceiter_android_vh_record_pcpu_rwsem_starttime(void*, task_struct*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_test_clear_look_around_ref(void*, page*)'
  [A] 'function int extcon_get_property_capability(extcon_dev*, unsigned int, unsigned int)'
  [A] 'function int netif_set_xps_queue(net_device*, const cpumask*, u16)'
  [A] 'function void* page_frag_alloc(page_frag_cache*, unsigned int, gfp_t)'
  [A] 'function void page_frag_free(void*)'
  [A] 'function bool rng_is_initialized()'

1 Removed variable:

  [D] 'tracepoint __tracepoint_android_vh_record_percpu_rwsem_lock_starttime'

20 Added variables:

  [A] 'const gic_chip_data* GKI_struct_gic_chip_data'
  [A] 'selinux_state* GKI_struct_selinux_state'
  [A] 'const swap_slots_cache* GKI_struct_swap_slots_cache'
  [A] 'tracepoint __tracepoint_android_vh_check_page_look_around_ref'
  [A] 'tracepoint __tracepoint_android_vh_do_futex'
  [A] 'tracepoint __tracepoint_android_vh_futex_wait_end'
  [A] 'tracepoint __tracepoint_android_vh_futex_wait_start'
  [A] 'tracepoint __tracepoint_android_vh_futex_wake_this'
  [A] 'tracepoint __tracepoint_android_vh_futex_wake_traverse_plist'
  [A] 'tracepoint __tracepoint_android_vh_futex_wake_up_q_finish'
  [A] 'tracepoint __tracepoint_android_vh_look_around'
  [A] 'tracepoint __tracepoint_android_vh_look_around_migrate_page'
  [A] 'tracepoint __tracepoint_android_vh_madvise_cold_or_pageout'
  [A] 'tracepoint __tracepoint_android_vh_ra_tuning_max_page'
  [A] 'tracepoint __tracepoint_android_vh_record_pcpu_rwsem_starttime'
  [A] 'tracepoint __tracepoint_android_vh_test_clear_look_around_ref'
  [A] 'tracepoint __tracepoint_net_dev_queue'
  [A] 'tracepoint __tracepoint_net_dev_xmit'
  [A] 'tracepoint __tracepoint_netif_receive_skb'
  [A] 'tracepoint __tracepoint_netif_rx'

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I300286a8e658793249f37797cd2ede7555dfacc9
2022-10-01 14:58:20 +02:00
android Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
arch Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
block This is the 5.10.140 stable release 2022-08-31 18:52:48 +02:00
certs certs/blacklist_hashes.c: fix const confusion in certs blacklist 2022-06-22 14:13:17 +02:00
crypto Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
Documentation Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
drivers Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
fs Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
include Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
init This is the 5.10.121 stable release 2022-07-23 16:10:22 +02:00
ipc ipc/mqueue: use get_tree_nodev() in mqueue_get_tree() 2022-06-09 10:21:17 +02:00
kernel Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
lib This is the 5.10.141 stable release 2022-09-07 09:44:58 +02:00
LICENSES
mm Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
net Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
samples This is the 5.10.133 stable release 2022-08-02 13:26:52 -07:00
scripts This is the 5.10.145 stable release 2022-09-24 09:54:08 +02:00
security Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
sound This is the 5.10.146 stable release 2022-09-29 17:06:30 +02:00
tools This is the 5.10.146 stable release 2022-09-29 17:06:30 +02:00
usr FROMLIST: kbuild: Add environment variables for userprogs flags 2022-05-10 16:09:36 +00:00
virt KVM: SEV: add cache flush to solve SEV cache incoherency issues 2022-09-28 11:10:28 +02:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
.mailmap
build.config.aarch64 ANDROID: arm64: enable compat vdso 2021-05-13 09:14:25 -07:00
build.config.allmodconfig ANDROID: Different fix for KABI breakage in 5.10.71 in struct sock 2021-10-12 14:48:00 +02:00
build.config.allmodconfig.aarch64
build.config.allmodconfig.arm
build.config.allmodconfig.x86_64
build.config.amlogic
build.config.arm ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for arm 2021-03-24 09:21:58 -07:00
build.config.common ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__ 2022-04-29 20:20:21 +00:00
build.config.db845c
build.config.gki
build.config.gki-debug.aarch64
build.config.gki-debug.x86_64
build.config.gki.aarch64 ANDROID: force struct selinux_state to be defined in KMI 2022-09-22 19:37:51 +00:00
build.config.gki.aarch64.fips140 ANDROID: ABI: add new symbols required by fips140.ko 2021-10-29 14:32:49 -07:00
build.config.gki.aarch64.fips140_eval_testing ANDROID: fips140: support "evaluation testing" builds via build.sh 2021-11-30 17:55:05 +00:00
build.config.gki.x86_64
build.config.gki_kasan ANDROID: build.config: Disable LTO for KASAN and Kprobes builds 2021-03-08 00:31:49 +00:00
build.config.gki_kasan.aarch64
build.config.gki_kasan.x86_64
build.config.gki_kprobes ANDROID: build.config: Disable LTO for KASAN and Kprobes builds 2021-03-08 00:31:49 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-03 02:03:02 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-03 02:03:02 +00:00
build.config.hikey960
build.config.khwasan ANDROID: Add a build config fragment for KHWASan. 2021-04-06 10:01:56 +00:00
build.config.rockchip ANDROID: GKI: rockchip: update fragment file 2022-08-19 19:27:37 +00:00
build.config.x86_64 ANDROID: build.config: Add vmlinux.symvers and modules.builtin to DIST_DIR 2021-04-15 10:24:17 +01:00
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS This is the 5.10.128 stable release 2022-07-28 16:54:11 +02:00
Makefile This is the 5.10.146 stable release 2022-09-29 17:06:30 +02:00
OWNERS ANDROID: Use authoritative Dr. No list from android-mainline 2021-07-22 15:25:25 +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.

    • 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 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 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)