git pull https://github.com/povik/linux for-marcan-merge
From https://github.com/povik/linux
 * branch                      for-marcan-merge -> FETCH_HEAD
Auto-merging arch/arm64/boot/dts/apple/t6001.dtsi
Auto-merging arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
Auto-merging arch/arm64/boot/dts/apple/t8103-j274.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103-j274.dts
Auto-merging arch/arm64/boot/dts/apple/t8103-j293.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103-j293.dts
Auto-merging arch/arm64/boot/dts/apple/t8103-j313.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103-j313.dts
Auto-merging arch/arm64/boot/dts/apple/t8103-j456.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103-j456.dts
Auto-merging arch/arm64/boot/dts/apple/t8103-pmgr.dtsi
Auto-merging arch/arm64/boot/dts/apple/t8103.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103.dtsi
Auto-merging drivers/clk/Kconfig
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Auto-merging drivers/clk/clk-apple-nco.c
CONFLICT (add/add): Merge conflict in drivers/clk/clk-apple-nco.c
Auto-merging drivers/dma/apple-admac.c
CONFLICT (add/add): Merge conflict in drivers/dma/apple-admac.c
Auto-merging drivers/iommu/apple-dart.c
Auto-merging sound/soc/apple/Kconfig
CONFLICT (add/add): Merge conflict in sound/soc/apple/Kconfig
Auto-merging sound/soc/apple/Makefile
CONFLICT (add/add): Merge conflict in sound/soc/apple/Makefile
Auto-merging sound/soc/apple/mca.c
CONFLICT (add/add): Merge conflict in sound/soc/apple/mca.c
Automatic merge failed; fix conflicts and then commit the result.