aosp/android-mainline: update series (rebase onto v5.16-rc5-171-g6441998e2e371)
up to 461a5ea6caf3b ("Merge 6441998e2e37 ("Merge tag 'audit-pr-20211216' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") into android-mainline")
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I380966ad80f2585f03e6662b490763ef038bbc76
diff --git a/android-mainline/ANDROID-GKI-clk-Add-support-for-clock-providers-with-sync-state.patch b/android-mainline/ANDROID-GKI-clk-Add-support-for-clock-providers-with-sync-state.patch
index 4a5fef6..48b3ff4 100644
--- a/android-mainline/ANDROID-GKI-clk-Add-support-for-clock-providers-with-sync-state.patch
+++ b/android-mainline/ANDROID-GKI-clk-Add-support-for-clock-providers-with-sync-state.patch
@@ -115,7 +115,7 @@
}
}
}
-@@ -3563,6 +3625,8 @@ static int __clk_core_init(struct clk_core *core)
+@@ -3571,6 +3633,8 @@ static int __clk_core_init(struct clk_core *core)
rate = 0;
core->rate = core->req_rate = rate;
@@ -124,7 +124,7 @@
/*
* Enable CLK_IS_CRITICAL clocks so newly added critical clocks
* don't get accidentally disabled when walking the orphan tree and
-@@ -3585,6 +3649,7 @@ static int __clk_core_init(struct clk_core *core)
+@@ -3593,6 +3657,7 @@ static int __clk_core_init(struct clk_core *core)
}
}
diff --git a/android-mainline/series b/android-mainline/series
index 34ac417..526fda9 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -1,8 +1,8 @@
#
# android-mainline patches
#
-# Applies onto upstream 2585cf9dfaadd Linux v5.16-rc5
-# Matches android-mainline 7ca50f6aa26ba ("Revert "ANDROID: fix build error in arch/arm64/include/asm/arch_timer.h"")
+# Applies onto upstream 6441998e2e371 Linux v5.16-rc5-171-g6441998e2e371
+# Matches android-mainline 461a5ea6caf3b ("Merge 6441998e2e37 ("Merge tag 'audit-pr-20211216' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") into android-mainline")
# Status: Tested
#
Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch
