aosp/android-mainline: update series
up to 7fb88b1c83759 ("ANDROID: gki_defconfig: disable various x86 and hw flags")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I886a965d46503af61b458429070d0859742cd237
diff --git a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
index cd7fd3c..bd7cb3f 100644
--- a/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
+++ b/android-mainline/NOUPSTREAM-ANDROID-gki_defconfigs.patch
@@ -26,8 +26,8 @@
arch/arm64/configs/gki_defconfig | 697 +++++++++++++++++++++++++
arch/riscv/configs/gki.config | 2 +
arch/riscv/configs/gki_defconfig | 1 +
- arch/x86/configs/gki_defconfig | 635 ++++++++++++++++++++++
- 6 files changed, 1348 insertions(+), 3 deletions(-)
+ arch/x86/configs/gki_defconfig | 647 +++++++++++++++++++++++
+ 6 files changed, 1360 insertions(+), 3 deletions(-)
create mode 100644 arch/arm64/configs/16k_gki.fragment
create mode 100644 arch/arm64/configs/gki_defconfig
create mode 100644 arch/riscv/configs/gki.config
@@ -817,7 +817,7 @@
new file mode 100644
--- /dev/null
+++ b/arch/x86/configs/gki_defconfig
-@@ -0,0 +1,635 @@
+@@ -0,0 +1,647 @@
+CONFIG_UAPI_HEADER_TEST=y
+CONFIG_LOCALVERSION="-mainline"
+CONFIG_KERNEL_LZ4=y
@@ -859,8 +859,10 @@
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_BOOT_CONFIG=y
++# CONFIG_UID16 is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_FHANDLE is not set
++# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_RSEQ is not set
+CONFIG_EMBEDDED=y
@@ -872,12 +874,20 @@
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_NR_CPUS=32
+# CONFIG_X86_MCE is not set
++# CONFIG_MICROCODE is not set
++# CONFIG_X86_5LEVEL is not set
++# CONFIG_MTRR_SANITIZER is not set
+CONFIG_EFI=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure bootconfig"
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=0
+# CONFIG_PM_WAKELOCKS_GC is not set
++# CONFIG_ACPI_AC is not set
++# CONFIG_ACPI_BATTERY is not set
++# CONFIG_ACPI_FAN is not set
++# CONFIG_ACPI_THERMAL is not set
++# CONFIG_X86_PM_TIMER is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_TIMES=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -1170,6 +1180,7 @@
+CONFIG_NULL_TTY=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_HW_RANDOM=y
++# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_DEVPORT is not set
+CONFIG_HPET=y
@@ -1294,6 +1305,7 @@
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_EDAC=y
+CONFIG_RTC_CLASS=y
++# CONFIG_RTC_HCTOSYS is not set
+CONFIG_DMABUF_HEAPS=y
+CONFIG_UIO=y
+CONFIG_VHOST_VSOCK=y
diff --git a/android-mainline/series b/android-mainline/series
index 00106f4..1ad49b5 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -2,7 +2,7 @@
# android-mainline patches
#
# Applies onto upstream d0f3ad23cf4f4 Linux v6.1-6342-gd0f3ad23cf4f4
-# Matches android-mainline 1694e2760e48d ("Merge d0f3ad23cf4f ("Merge tag 'spi-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi") into android-mainline")
+# Matches android-mainline 7fb88b1c83759 ("ANDROID: gki_defconfig: disable various x86 and hw flags")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch
