linux-next: manual merge of the tip tree with the arm tree

2020-05-28 Thread Stephen Rothwell
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

linux-next: manual merge of the tip tree with the arm tree

2013-06-19 Thread Stephen Rothwell
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

linux-next: manual merge of the tip tree with the arm tree

2013-06-19 Thread Stephen Rothwell
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