manual merge

diff --git a/bootstrap.sh b/bootstrap.sh
index 02e2edbfcbf3012f09e78882a05d73b2c439396d..8cf87aaa077c90b6eb1b30670c41bdd440a14937 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -30,6 +30,7 @@ build_linux()
         curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
         curl -s https://tg.st/u/DXyl.patch | git am -
         curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am -
+        curl -s https://tg.st/u/0001-Hookup-gpio-backlight.patch | git am -
         curl -s https://tg.st/u/XKVZ.patch | git am -
         curl -s https://tg.st/u/config-2022-02-19 > .config
         make olddefconfig

diff --git a/doc/notes.txt b/doc/notes.txt
index adb17cbff45bbb2e0137f1e67a99714bb01dc703..fbfd019052d0c51380f3cf5429cd17111dbff3f3 100644 (file)
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -55,6 +55,7 @@ echo 1 > /sys/module/hid_apple/parameters/swap_opt_cmd
 # j`ey on deleting efi and Linux partitions from the gui in macos
 20:46 < j`ey> Glanzmann: I didnt figure it out at the diskutil cli, but I managed to do it from the GUI, I think you have to erase/reformat as APFS before you can delete the volumes
 10:53 < j`ey> Glanzmann: for your notes: < tpw_rules> you can delete a non-apfs partition with: diskutil eraseVolume free n disk0sX
+21:07 < tpw_rules> you can delete a non-apfs partition with: diskutil eraseVolume free n disk0sX
 
 08:54 < mixi> Glanzmann: the command you're looking for should be "dtc -I dtb -O dts /sys/firmware/fdt"
 08:57 < jannau> Glanzmann: dtc -I fs -O dts -o - /proc/device-tree