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] [day] [month] [year] [list]

Message-Id: <20130624152930.4c6cef3c5a272d8ca82d94c6@canb.auug.org.au>
Date:	Mon, 24 Jun 2013 15:29:30 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Suman Anna <s-anna@...com>
Cc:	Arnd Bergmann <arnd@...db.de>, Tony Lindgren <tony@...mide.com>,
	Olof Johansson <olof@...om.net>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	<linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	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,

On Fri, 21 Jun 2013 10:24:44 -0500 Suman Anna <s-anna@...com> wrote:
>
> On 06/21/2013 02:36 AM, Arnd Bergmann wrote:
> > On Friday 21 June 2013, Tony Lindgren wrote:
> >>> I wonder if this mess is caused by the fact that I did the revert
> >>> instead of rebuilding our for-next and dropping the merge in the first
> >>> place.
> >>>
> >>> I'll rebuild our for-next (or maybe Arnd will beat me to it) before
> >>> next linux-next build, i.e. Sunday night my time.
> >>
> >> Could be, especially if some of the commits are the same in the reverted
> >> branch and newly merged branch as git might think that some merges have
> >> been already resolved the right way earlier.
> 
> Yes, please drop the particular mailbox branch that you were picking
> into linux-next. It was the previous framework which was dropped at the
> last minute during the 3.10 merge window in favor of new one still under
> its final development steps, so we will not be using any commits from
> that branch.  Sorry for the trouble on this one. The branch that Arnd
> took has some of the OMAP patches reworked in preparation for the
> newer one.

OK, I have removed the mailbox tree for now.  Let me know if you want it
to be back in again.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped