* linux-next: manual merge of the h8300-remove tree with Linus' tree
@ 2013-09-15 23:56 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-09-15 23:56 UTC (permalink / raw)
To: Guenter Roeck; +Cc: linux-next, linux-kernel, Martin Schwidefsky
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Hi Guenter,
Today's linux-next merge of the h8300-remove tree got a conflict in
arch/h8300/Kconfig between commit 0244ad004a54 ("Remove GENERIC_HARDIRQ
config option") from Linus' tree and commit d02babe847bf ("Drop support
for Renesas H8/300 (h8300) architecture") from the h8300-remove tree.
I just removed the file and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-15 23:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-15 23:56 linux-next: manual merge of the h8300-remove tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).