linux-kernel - Re: [GIT PULL] gpio: fixes for v5.12-rc3

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: <YEiz6fJt9SUBBmJ4@smile.fi.intel.com>
Date:   Wed, 10 Mar 2021 13:56:25 +0200
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Bartosz Golaszewski <brgl@...ev.pl>,
        Linus Walleij <linus.walleij@...aro.org>,
        "open list:GPIO SUBSYSTEM" <linux-gpio@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] gpio: fixes for v5.12-rc3

On Tue, Mar 09, 2021 at 12:04:58PM -0800, Linus Torvalds wrote:
> On Tue, Mar 9, 2021 at 7:43 AM Bartosz Golaszewski <brgl@...ev.pl> wrote:
> >
> > I realized only after I sent out this PR that I had rebased the branch
> > on top of v5.12-rc2 (because of the v5.12-rc1 situation) without
> > --rebase-merges and this caused git to drop the merge commit for
> > Andy's pull-request. Please let me know if you can pull this as is or
> > if I should rebuild my branch and resend.
> 
> This is fine - it's small, it's a one-time pain, and there's that reason for it.
> 
> So as long as Andy is aware of how his patches got rebased and don't
> match his branch any more, I think it's not a big deal, and I've
> pulled it as-is.

Thanks! It's not big deal, but a good learning anyway how to communicate and
proceed with the git in such (rare I suppose) situations.

-- 
With Best Regards,
Andy Shevchenko