lkml.org 
[lkml]   [2012]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the ia64 tree with the asm-generic tree
Date
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the ia64 tree got a conflict in
> arch/ia64/include/asm/Kbuild between commit e7a570ff7dff ("asm-generic:
> Add default clkdev.h") from the asm-generic tree and commit f68301fee715
> ("UAPI: (Scripted) Disintegrate arch/ia64/include/asm") from the ia64
> tree.
>
> I fixed it up (see below - I am not sure if this is the correct fix) and
> can carry the fix as necessary (no action is required).

It is.

"header +=" and "genhdr +=" belong in the UAPI Kbuild; "generic +=" belongs in
the original Kbuild.

In his pull request, Arnd said:

There may be a few small merge conflicts between Mark's patch and the
following arch header file split patches. In each case the solution
will be to keep the new "generic-y += clkdev.h" line, even if it ends
up being the only line in the Kbuild file.

David


\
 
 \ /
  Last update: 2012-10-08 19:01    [W:0.406 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site