linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the mailbox 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:	Fri, 21 Jun 2013 16:41:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Suman Anna <s-anna@...com>,
	Omar Ramirez Luna <omar.ramirez@...itl.com>,
	Loic Pallardy <loic.pallardy@...com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the mailbox
 tree

Hi all,

On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mailbox/Kconfig between commit a1824eaab70f ("mailbox: OMAP:
> introduce mailbox framework") from the mailbox tree and commit
> c869c75c16b3 ("mailbox/omap: move the OMAP mailbox framework to drivers")
> from the arm-soc tree.
> 
> I fixed it up (I suspect not properly - see below) and can carry the fix
> as necessary (no action is required).
> 
> It looks like we have two different versions of these changes in
> linux-next now, so please clean it all up.  i.e. can I just drop the
> mailbox tree now?

OK, things went steeply downhill from here, so I went back and removed
the mailbox tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped