From: Sam Ravnborg <sam@ravnborg.org>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, mmarek@suse.cz, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the kbuild tree with the sparc-next tree
Date: Wed, 16 May 2012 06:46:46 +0200 [thread overview]
Message-ID: <20120516044646.GA340@merkur.ravnborg.org> (raw)
In-Reply-To: <20120515.235747.716576574995746023.davem@davemloft.net>
On Tue, May 15, 2012 at 11:57:47PM -0400, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 May 2012 13:44:30 +1000
>
> > Today's linux-next merge of the kbuild tree got a conflict in
> > arch/sparc/boot/Makefile between commit 51f19cfa76d7 ("sparc32: drop
> > build time btfixup patching") from the sparc-next tree and commit
> > 95698570510b ("kbuild: refactor final link of sparc32") from the kbuild
> > tree.
> >
> > I have no idea, so I used the version from the sparc-next tree.
> >
> > Sam, can you have a look and work this out, please?
>
> As Sam states in:
>
> http://patchwork.ozlabs.org/patch/159094/
>
> This patch will conflict badly with a patch in kbuild-next.
>
> The fix is simple - drop all changes from kbuild-next.
>
> :-)
The above comment is true for both arch/sparc/Makefile and
arch/sparc/bot/Makefile.
sparc-next will also conflict with net-next.
net-next add the following line to arch/sparc/Makefile:
+core-y += arch/sparc/net/
The fix is to add this line to the newly introduced
arch/sparc/Kbuild file like this:
obj-y += net/
Sorry for these conflicts but we have been busy in sparc land
this round.
Sam
prev parent reply other threads:[~2012-05-16 4:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 3:44 linux-next: manual merge of the kbuild tree with the sparc-next tree Stephen Rothwell
2012-05-16 3:57 ` David Miller
2012-05-16 4:46 ` Sam Ravnborg [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=20120516044646.GA340@merkur.ravnborg.org \
--to=sam@ravnborg.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).