lkml.org 
[lkml]   [2021]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@bgdev.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


\
 
 \ /
  Last update: 2021-03-10 12:57    [W:0.031 / U:0.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site