Rebased patches for 5.15.111-rc2 but build error

With 5.15.111 due out tomorrow, I began refreshing the patches for 5.15.111-rc2. This one is particularly tedious. I have a working draft below, but I messed up something as I cannot build for bcm2711/RPi4B

Here is the error, wondering if anyone see something obvious in my attempt.

% make -j1 V=s
...
  SYSMAP  System.map
make[6]: Entering directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
  OBJCOPY arch/arm64/boot/Image
make[6]: Leaving directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[6]: Entering directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[7]: Entering directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[7]: Leaving directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[7]: Entering directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
scripts/Makefile.build:44: arch/arm64/boot/dts/overlays/Makefile: No such file or directory
make[7]: *** No rule to make target 'arch/arm64/boot/dts/overlays/Makefile'.  Stop.
make[7]: Leaving directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[6]: *** [scripts/Makefile.build:552: arch/arm64/boot/dts/overlays] Error 2
make[6]: Leaving directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[5]: *** [Makefile:1451: dtbs] Error 2
make[5]: Leaving directory '/scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111'
make[4]: *** [Makefile:34: /scratch/union/build_dir/target-aarch64_cortex-a72_musl/linux-bcm27xx_bcm2711/linux-5.15.111/.modules] Error 2
make[4]: Leaving directory '/scratch/union/target/linux/bcm27xx'
make[3]: *** [Makefile:11: compile] Error 2
make[3]: Leaving directory '/scratch/union/target/linux'
time: target/linux/compile#7.03#2.17#9.23
    ERROR: target/linux failed to build.
make[2]: *** [target/Makefile:30: target/linux/compile] Error 1
make[2]: Leaving directory '/scratch/union'
make[1]: *** [target/Makefile:23: /scratch/union/staging_dir/target-aarch64_cortex-a72_musl/stamp/.target_compile] Error 2
make[1]: Leaving directory '/scratch/union'
make: *** [/scratch/union/include/toplevel.mk:231: world] Error 2

@Ansuel @hauke

i would firstly check what changes were backported in this new kernel.

I think these are all backported, @Ansuel - see: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.15

This could have to do with some odd behavior from quilt when I adjusted target/linux/bcm27xx/patches-5.15/950-0078-BCM2708-Add-core-Device-Tree-support.patch:

% cd build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-bcm27xx_bcm2708/linux-5.15.111
% quilt push -f
Applying patch platform/950-0078-BCM2708-Add-core-Device-Tree-support.patch
patching file arch/arm/boot/dts/Makefile
Hunk #2 succeeded at 1507 (offset 1 line).
patching file arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
...
Hunk #1 FAILED at 5.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/boot/dts/broadcom/Makefile.rej
patching file arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
patching file arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
patching file arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
patching file arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
patching file arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
patching file arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
patching file arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
patching symbolic link arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
patching symbolic link arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
patching symbolic link arch/arm64/boot/dts/overlays
patching file scripts/Makefile.dtbinst
patching file scripts/Makefile.lib
Applied patch platform/950-0078-BCM2708-Add-core-Device-Tree-support.patch (forced; needs refresh)

<<< manually adjusted arch/arm64/boot/dts/broadcom/Makefile >>>

% quilt refresh
diff: arch/arm64/boot/dts/overlays/null: No such file or directory
Diff failed on file 'arch/arm64/boot/dts/overlays', aborting

To circumvent this, I simply did:

% touch arch/arm64/boot/dts/overlays/null

That allowed the quilt refresh to complete successfully.