[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the tip tree with the h8300-remove tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2013-09-27 6:12:38
Message-ID: 20130927161238.f168bf3544c56ae1c1dcf439 () canb ! auug ! org ! au
[Download RAW message or body]

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).

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]