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]

Message-ID: <4E14F373.1020307@snapgear.com>
Date:	Thu, 7 Jul 2011 09:44:51 +1000
From:	Greg Ungerer <gerg@...pgear.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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

On 07/07/11 01:57, Jonas Bonn wrote:
>
> On Tue, 2011-07-05 at 13:59 +1000, Stephen Rothwell wrote:
>> Hi Rusty,
>>
>> 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>

Thanks
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@...pgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/