Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1302447

Re: linux-next: manual merge of the akpm-current tree with the kbuild tree

Show all headers | View raw

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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with the kbuild  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-06 08:00 +0100
  Re: linux-next: manual merge of the akpm-current tree with the kbuild  tree Michal Marek <mmarek@suse.cz> - 2016-01-06 09:10 +0100

csiph-web