diff options
| author | Lee Jones <joneslee@google.com> | 2024-01-30 08:32:26 +0000 |
|---|---|---|
| committer | Lee Jones <joneslee@google.com> | 2024-01-30 11:00:07 +0000 |
| commit | c2882755a754cef6f615d93bff7d5b3b78bffc69 (patch) | |
| tree | b321baa294c352f58ca347b3631334d05531616d | |
| parent | 892e11b1b7b096ccd182fb4a8877ff58b0cfde1f (diff) | |
| download | common-patches-c2882755a754cef6f615d93bff7d5b3b78bffc69.tar.gz | |
aosp/android-mainline: update series (rebase onto v6.6-13233-gd99b91a99be43)
up to afb85200e5512 ("Merge d99b91a99be4 ("Merge tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline")
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I3496345adde4685f7089ba6df846bef420d66bc0
| -rw-r--r-- | android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch | 2 | ||||
| -rw-r--r-- | android-mainline/series | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch index 57ad8217..42dc5143 100644 --- a/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch +++ b/android-mainline/ANDROID-Initial-commit-of-Incremental-FS.patch @@ -230,7 +230,7 @@ new file mode 100644 diff --git a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -10351,6 +10351,13 @@ F: Documentation/hwmon/ina2xx.rst +@@ -10362,6 +10362,13 @@ F: Documentation/hwmon/ina2xx.rst F: drivers/hwmon/ina2xx.c F: include/linux/platform_data/ina2xx.h diff --git a/android-mainline/series b/android-mainline/series index 85bbdffb..98dbe049 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -1,8 +1,8 @@ # # android-mainline patches # -# Applies onto upstream e392ea4d4d008 Linux v6.6-12893-ge392ea4d4d008 -# Matches android-mainline e7d9a0a6ed4ac ("Merge e392ea4d4d00 ("Merge tag 's390-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux") into android-mainline") +# Applies onto upstream d99b91a99be43 Linux v6.6-13233-gd99b91a99be43 +# Matches android-mainline afb85200e5512 ("Merge d99b91a99be4 ("Merge tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch |