From: David Howells <dhowells@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: dhowells@redhat•com, "Luck, Tony" <tony.luck@intel•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Arnd Bergmann <arnd@arndb•de>
Subject: Re: linux-next: manual merge of the ia64 tree with the asm-generic tree
Date: Mon, 08 Oct 2012 17:25:26 +0100 [thread overview]
Message-ID: <29959.1349713526@warthog.procyon.org.uk> (raw)
In-Reply-To: <20121008101131.a99cc80086482d0b1fc2c230@canb.auug.org.au>
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
prev parent reply other threads:[~2012-10-08 16:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-07 23:11 linux-next: manual merge of the ia64 tree with the asm-generic tree Stephen Rothwell
2012-10-08 16:25 ` David Howells [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=29959.1349713526@warthog.procyon.org.uk \
--to=dhowells@redhat$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tony.luck@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox