diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:42 +0000 |
| commit | 8cd3ed2680807759220ec6de5da9f80405eab4a2 (patch) | |
| tree | 25f6840bd45ef87eda81d0289cb9a11e1c4ddc36 | |
| parent | 0ba734da84436041f8ca3ee848e32353b09eaba7 (diff) | |
| parent | ab9929086c0038bdbc1887c1d55190c30bd34515 (diff) | |
| download | common-patches-8cd3ed2680807759220ec6de5da9f80405eab4a2.tar.gz | |
Merge changes I2442669f,Id5f0e2cd,I6d0bd4f4,I5b768637 into main
* changes:
aosp/android-mainline: update series (rebase onto v6.7-rc8-159-ga4ab2706bb128)
aosp/android-mainline: update series (rebase onto v6.7-rc8-157-g6c23529c08fc7)
aosp/android-mainline: update series (rebase onto v6.7-rc8-152-g2b5bd1498da55)
aosp/android-mainline: update series (rebase onto v6.7-rc8-130-g6d0dc8559c847)
| -rw-r--r-- | android-mainline/series | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android-mainline/series b/android-mainline/series index 6828503d..b6aa0f40 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -1,8 +1,8 @@ # # android-mainline patches # -# Applies onto upstream 3eca89454aec4 Linux v6.7-rc8-123-g3eca89454aec4 -# Matches android-mainline bf7cf4b92c292 ("Merge 3eca89454aec ("Merge tag '6.7-rc8-smb3-mchan-fixes' of git://git.samba.org/sfrench/cifs-2.6") into android-mainline") +# Applies onto upstream a4ab2706bb128 Linux v6.7-rc8-159-ga4ab2706bb128 +# Matches android-mainline 0d8a6c7eb97fc ("Merge a4ab2706bb12 ("Merge tag 'firewire-fixes-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394") into android-mainline") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch |