Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/h8300/include/asm/Kbuild between commit 4b0847842204 ("Drop support
for Renesas H8/300 (h8300) architecture") from the h8300-remove tree and
commit a787870924db ("sched, arch: Create asm/preempt.h") from the tip
tree.
I just removed the file and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpPFpRXv808Q.pgp
Description: PGP signature
