Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/arm32-stub.c
between commit:
d0f9ca9be11f ("ARM: decompressor: run decompressor in place if loaded via
UEFI")
from the arm tree and commit:
793473c28a4b ("efi/libstub: Move
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/kernel/Makefile between commit 4477ca45fb36 ("ARM: ARMv7-M:
Allow the building of new kernel port") from the arm tree and commit
38ff87f77af0 ("sched_clock: Make ARM's sched_clock generic for all
architectures") from the
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm/kernel/Makefile between commit 4477ca45fb36 (ARM: ARMv7-M:
Allow the building of new kernel port) from the arm tree and commit
38ff87f77af0 (sched_clock: Make ARM's sched_clock generic for all
architectures) from the tip
3 matches
Mail list logo