From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sat, 22 Jan 2022 21:44:20 +0000 (+0100)
Subject: manual merge
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/a66821fc2b1c599c15c05e2b64abb16034930294?ds=sidebyside

manual merge
---

a66821fc2b1c599c15c05e2b64abb16034930294
diff --cc README
index 8f4e23f,b1a4cf4..86e81ce
--- a/README
+++ b/README
@@@ -22,7 -24,4 +24,9 @@@ ln -s lib/systemd/systemd ini
  
  find . | cpio --quiet -H newc -o | pigz > /boot/initrd.gz
  
+ > etc/motd
++
 +cp /boot/efi/EFI/BOOT/BOOTAA64.EFI efi/boot/
 +cp /boot/vmlinuz-5.16.0-asahi-next-20220118-14779-ga4d177b3ad21-dirty vmlinuz
 +
 +./scripts/kconfig/merge_config.sh .config .config-fragment