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

Message-ID: <CAHp75VevuYCZVPw8HHcaoGdHBvXxHTNnujbf2BUyBECmFHZFDQ@mail.gmail.com>
Date:   Wed, 18 Nov 2020 11:29:24 +0200
From:   Andy Shevchenko <andy.shevchenko@...il.com>
To:     Linus Walleij <linus.walleij@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Gustavo A. R. Silva" <gustavo@...eddedor.com>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gpio tree with the kspp-gustavo tree

On Wed, Nov 18, 2020 at 9:53 AM Linus Walleij <linus.walleij@...aro.org> wrote:
>
> On Wed, Nov 18, 2020 at 4:24 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> >   b8e0b635e6e6 ("gpio: Fix fall-through warnings for Clang")
> >
> > from the kspp-gustavo tree and commit:

Stephen, the fix looks good to me.

> Interesting I guess this is a clang tree?
> Please rebase on the GPIO tree and send me + Andy this patch so we
> can integrate it properly.

Linus, I don't think they are rebasing their trees, so we simply may
pull their tree to yours, or they may pull your immutable branch/tag
to theirs.
In any case it's a standard procedure to solve conflicts. I think
Linus T. can do it when the second PR (whoever will be second) comes
to him.
Just mention this conflict in a PR message.

-- 
With Best Regards,
Andy Shevchenko