linux-kernel - linux-next: manual merge of the rr tree with the openrisc 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20110716181723.08d5a7b96cca094dee74f825@canb.auug.org.au>
Date:	Sat, 16 Jul 2011 18:17:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonas Bonn <jonas@...thpole.se>
Subject: linux-next: manual merge of the rr tree with the openrisc tree

Hi Rusty,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped