Re: linux-next: manual merge of the sparc-next tree with the sparc tree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 6 Aug 2014 09:58:45 +1000

> Today's linux-next merge of the sparc-next tree got a conflict in
> arch/sparc/mm/init_64.c between commit 4ca9a23765da ("sparc64: Guard
> against flushing openfirmware mappings") from the sparc tree and commit
> f6d4fb5cc047 ("sparc64 - add mem to iomem resource") from the
> sparc-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen, simple non-overlapping additions and I'm about to push
that resolution to my tree.

Thanks again!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/