From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg Ungerer <gerg@snapgear.com>
Cc: Jonas Bonn <jonas@southpole.se>,
Rusty Russell <rusty@rustcorp.com.au>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Greg Ungerer <gerg@uclinux.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the rr tree with the tree
Date: Thu, 7 Jul 2011 10:24:32 +1000 [thread overview]
Message-ID: <20110707102432.5a779744e247652be005b592@canb.auug.org.au> (raw)
In-Reply-To: <4E14F373.1020307@snapgear.com>
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
Hi all,
On Thu, 7 Jul 2011 09:44:51 +1000 Greg Ungerer <gerg@snapgear.com> wrote:
>
> On 07/07/11 01:57, Jonas Bonn wrote:
> >
> > On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
> >>
> >> Today's linux-next merge of the rr tree got a conflict in
> >> arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
> >> 4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
> >> from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
> >> use default loader hooks") from the rr tree.
> >>
> >> The former removes these files, so I did that.
> >>
> >> I then added this merge fix up patch (which I can carry as necessary and
> >> may not be coorrect):
> >>
> >> From: Stephen Rothwell<sfr@canb.auug.org.au>
> >> Date: Tue, 5 Jul 2011 13:12:26 +1000
> >> Subject: [PATCH] modules/m68k: make arch's use default loader hooks
> >>
> >> Signed-off-by: Stephen Rothwell<sfr@canb.auug.org.au>
> >> ---
> >> arch/m68k/kernel/module.c | 27 ---------------------------
> >> 1 files changed, 0 insertions(+), 27 deletions(-)
> >>
> >
> > That patch looks good to me.
> >
> > Acked-by: Jonas Bonn<jonas@southpole.se>
>
> Looks fine to me too:
>
> Acked-by: Greg Ungerer <gerg@uclinux.org>
OK, so now someone just has to remember to apply it (or tell Linus, or
fix up the trees) during the merge window. That person probably won't
be me (since I will not be online next week (assuming Linus follows
through and opens the merge window next week).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-07-07 0:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 3:59 Stephen Rothwell
2011-07-06 15:57 ` Jonas Bonn
2011-07-06 23:44 ` Greg Ungerer
2011-07-07 0:24 ` Stephen Rothwell [this message]
2011-07-07 1:07 ` Rusty Russell
2011-07-19 11:27 ` Jonathan Cameron
2011-07-21 7:55 ` Rusty Russell
2011-07-25 1:43 ` Stephen Rothwell
2011-07-25 2:09 ` Greg Ungerer
-- strict thread matches above, loose matches on Subject: below --
2009-06-16 3:06 Stephen Rothwell
2009-06-09 3:56 Stephen Rothwell
2009-06-09 9:52 ` Stephen Rothwell
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=20110707102432.5a779744e247652be005b592@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.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
all inboxes | Powered by JetHome®