Re: linux-next: manual merge of the blackfin tree with Linus' tree

[Mike Frysinger]

On Wed, Sep 16, 2009 at 21:26, Stephen Rothwell wrote:
> Today's linux-next merge of the blackfin tree got a conflict in
> arch/blackfin/mm/sram-alloc.c between commit
> b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
> DEFINE_PER_CPU_SHARED_ALIGNED()") from Linus' tree and commit
> 40bf94d6d1158fb6d6d67a666e6b16ab6ac3986e ("Blackfin: push SRAM locks down
> into related ifdefs") from the blackfin tree.
>
> The latter moved the code that the former modified. ÂI fixed it up (see
> below) and can carry the fix for a while.

ive pulled down the latest mainline and rebased my branch onto it.
thanks for the heads up.
-mike
--
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/