lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the akpm-current tree with the kbuild tree
From
Date
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



\
 
 \ /
  Last update: 2016-01-06 09:41    [W:0.082 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site