linux-kernel - Re: linux-next: manual merge of the gpio tree with the staging 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: <CACRpkdYtux7ZqJ1VLbpa0Qgk3Nf+SczGdhOT6AK1GsNQ0b_NxQ@mail.gmail.com>
Date:   Mon, 30 Jan 2017 18:28:16 +0100
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>,
        "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Roman Sommer <roman.sommer@....de>,
        Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: Re: linux-next: manual merge of the gpio tree with the staging tree

On Mon, Jan 30, 2017 at 5:28 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.

OK I'll mention it to Linus (the big penguin). Thanks!

Linus Walleij