Albert I 28d536c9be init/Kconfig: Fix AOSP mismerges ...

Commit ae71030fd5 ("ANDROID: sched/tune: add initial support for CGroups
based boosting") mismerges Kconfig entries by adding duplicate CGROUP configs
which was moved by commit 6bf024e693 ("cgroup: put controller Kconfig
options in meaningful order") just below them.

Remove duplicated entries added by AOSP and move CGROUP_SCHEDTUNE after
CGROUP_SCHED.

Signed-off-by: Albert I <kras@raphielgang.org>
Signed-off-by: Aman Singh <amankumarsingh1412@gmail.com>
Signed-off-by: tejas101k <tejassingh649@rediffmail.com>
Signed-off-by: negrroo <mohammedaelnaggar1@gmail.com>
Signed-off-by: kanonifyX <kanonify01@gmail.com>

2025-08-31 09:51:18 +07:00

..

calibrate.c

…

do_mounts_dm.c

init: Initialize uuid pointer

2017-06-05 17:07:49 -07:00

do_mounts_initrd.c

init/do_mounts: initrd_load() can be boolean

2016-01-20 17:09:18 -08:00

do_mounts_md.c

…

do_mounts_rd.c

init: use pr_cont() when displaying rotator during ramdisk loading.

2016-11-24 09:32:20 -08:00

do_mounts.c

CHROMIUM: dm: boot time specification of dm=

2017-01-27 13:55:15 -08:00

do_mounts.h

CHROMIUM: dm: boot time specification of dm=

2017-01-27 13:55:15 -08:00

init_task.c

sched/core: Allow putting thread_info into task_struct

2016-09-15 08:25:13 +02:00

initramfs.c

init: Add CONFIG_INITRAMFS_IGNORE_SKIP_FLAG

2023-01-14 13:34:19 +00:00

Kconfig

init/Kconfig: Fix AOSP mismerges

2025-08-31 09:51:18 +07:00

main.c

Merge 4.9.326 into android-4.9-q

2022-08-25 12:09:51 +02:00

Makefile

CHROMIUM: dm: boot time specification of dm=

2017-01-27 13:55:15 -08:00

noinitramfs.c

ANDROID: initramfs: Add skip_initramfs command line option

2017-01-27 13:52:19 -08:00

version.c

UPSTREAM: locking/atomic, kref: Add KREF_INIT()

2021-01-05 16:00:48 +00:00