linux-kernel - Re: linux-next: manual merge of the mfd tree with Linus' 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: <AANLkTikME5pB7t95wTLxcVOq_QK26bFZ3=zDpEz2wXWo@mail.gmail.com>
Date:	Wed, 23 Mar 2011 18:57:43 +0100
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Philippe Langlais <philippe.langlais@...aro.org>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree

2011/3/22 Samuel Ortiz <sameo@...ux.intel.com>:

>> Fix looks correct, Sam if you push this to the MFD tree before
>> the pull request I'll be happy.
> I have just dropped 00423735a08e0d4030688496bca93f25c5e60111, since you were
> willing to carry it out after the MFD tree merge. Is that still your plan ?

Yes if Torvalds accepts that and the merge window isn't already
closed by then, else it will go for 2.6.40, no big deal.

Yours,
Linus Walleij
--
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/