Hi Al,
Since part of the tip tree has been merged into the vfs tree, this
conflict also applies to the vfs tree, now.
On Fri, 23 Jun 2017 13:50:17 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm/include/uapi/asm/Kbuild
>
> between commit:
>
> ae3f4151737d ("kbuild: replace genhdr-y with generated-y")
>
> from the kbuild tree and commit:
>
> 6bc51cbaa9d7 ("signal: Remove non-uapi <asm/siginfo.h>")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm/include/uapi/asm/Kbuild
> index 424935e4515d,e9b098d6b766..000000000000
> --- a/arch/arm/include/uapi/asm/Kbuild
> +++ b/arch/arm/include/uapi/asm/Kbuild
> @@@ -1,6 -1,8 +1,8 @@@
> # UAPI Header export list
> include include/uapi/asm-generic/Kbuild.asm
>
> -genhdr-y += unistd-common.h
> -genhdr-y += unistd-oabi.h
> -genhdr-y += unistd-eabi.h
> +generated-y += unistd-common.h
> +generated-y += unistd-oabi.h
> +generated-y += unistd-eabi.h
> +
> + generic-y += siginfo.h
--
Cheers,
Stephen Rothwell
--
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
