On Mon, Feb 10, 2014 at 03:00:47PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep
> checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock
> may not be held in some circumstances") from the akpm-current tree.
>
> These patches try to achieve the same thing, so I arbitrarily chose the
> version from the akpm-current tree.
My bad -- I forgot to remove my version.
Thanx, Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
