linux-kernel - Re: linux-next: manual merge of the rr tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 7 Jul 2011 10:24:32 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	Jonas Bonn <jonas@...thpole.se>,
	Rusty Russell <rusty@...tcorp.com.au>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Greg Ungerer <gerg@...inux.org>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: Re: linux-next: manual merge of the rr tree with the  tree

Hi all,

On Thu, 7 Jul 2011 09:44:51 +1000 Greg Ungerer <gerg@...pgear.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@...b.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@...b.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@...thpole.se>
> 
> Looks fine to me too:
> 
> Acked-by: Greg Ungerer <gerg@...inux.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped