[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wiiuSPZGh1ai_NuV8BHgXO36H_aQ28Bx1u82gE23S1u0g@mail.gmail.com>
Date: Tue, 9 Mar 2021 12:04:58 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Bartosz Golaszewski <brgl@...ev.pl>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
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 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.
Linus
Powered by blists - more mailing lists