From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 4 Dec 2022 18:28:23 +0000 (+0100)
Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/fe26e69fad1fb8e2288a78997aeb0b209cca9a18?hp=56d149238ce23b434745d056d2e5458564adc210

Merge branch 'master' of a.gmvl.de:/git/m1-debian
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 251ad0d..ca3426d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,7 +31,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.0-rc6-1; git clean -f -x -d &> /dev/null
+        git reset --hard asahi-6.1-rc6-5; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
         cat ../../config-16k.txt > .config
         make olddefconfig
@@ -46,7 +46,7 @@ build_m1n1()
         cd m1n1
         git fetch -a -t
         # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
-        git reset --hard v1.1.4; git clean -f -x -d &> /dev/null
+        git reset --hard v1.1.8; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -59,9 +59,8 @@ build_uboot()
         cd u-boot
         git fetch -a -t
         # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
-        git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null
+        git reset --hard asahi-v2022.10-1; git clean -f -x -d &> /dev/null
         git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
-        curl -s https://tg.st/u/0001-usb_setup_descriptor-Add-1ms-delay-in-order-to-unbre.patch | git am -
 
         make apple_m1_defconfig
         make -j `nproc`