From: Jonas Bonn <jonas@southpole.se>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the rr tree with the openrisc tree
Date: Sat, 16 Jul 2011 18:01:08 +0200 [thread overview]
Message-ID: <1310832068.14168.5.camel@localhost> (raw)
In-Reply-To: <20110716181723.08d5a7b96cca094dee74f825@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]
On Sat, 2011-07-16 at 18:17 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the rr tree got a conflict in
> arch/openrisc/kernel/module.c between commit 07319a81a55f ("OpenRISC:
> Module support") from the openrisc tree and commit 7c71b2f8e35c
> ("modules: make arch's use default loader hooks") from the rr tree.
>
> This is an indirect conflict that turns up because
> arch/openrisc/kernel/module.c is based very closely on a file that is
> modified by the rr commit. I have just used the openrisc version of the
> file, but I assume that much of it could be removed.
The OpenRISC tree should depend on that patch from Rusty's tree and the
file arch/openrisc/kernel/module.c should be a bit simpler. I'll push
out an updated OpenRISC tree this evening that has that fixed and we'll
see if the conflict doesn't go away.
That said, I don't quite understand why there's a conflict there at
all... the OpenRISC tree should have been independent of that patch in
any case.
/Jonas
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
prev parent reply other threads:[~2011-07-16 16:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 8:17 linux-next: manual merge of the rr tree with the openrisc tree Stephen Rothwell
2011-07-16 16:01 ` Jonas Bonn [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=1310832068.14168.5.camel@localhost \
--to=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.