On 2016-01-06 07:54, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> scripts/tags.sh
>
> between commit:
>
> 93209d65c1d3 ("tags: Unify emacs and exuberant rules")
>
> from the kbuild tree and commit:
>
> ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's correct, thanks.
Michal
--
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
