linux-kernel - Re: linux-next: manual merge of the gpio tree with the mips 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]

Date:	Thu, 12 May 2016 15:35:28 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Ralf Baechle <ralf@...ux-mips.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Huacai Chen <chenhc@...ote.com>
Subject: Re: linux-next: manual merge of the gpio tree with the mips tree

On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Yeah this is trivial and ACKed by the MIPS mainatainer so should be
safe, thanks!

Yours,
Linus Walleij