On Tue, Mar 9, 2021 at 5:38 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote: > On Tue, Mar 9, 2021 at 4:33 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: > > On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote: ... > > Did you rebase the branch after pulling? > > > > That will drop the merge commit, and will also make linux-next > > complain that the commiter has not signed off the commits. > > (I.e. don't rebase a branch where you pulled in something.) > > > > Yours, > > Linus Walleij > > Ah cr*p I did because of the v5.12-rc1 problem signalled by Linus Torvalds. :( > > And I already sent a PR to him too... > > Anything I can do now to fix that? Yep! Steps are easy: 0) tell Linus T. that you have to redo PR 1) take the base as https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git/commit/?h=gpio/for-current&id=cf25ef6b631c6fc6c0435fc91eba8734cca20511 2) Merge my tag as I explained in the other mail thread 3) (re)apply https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git/commit/?h=gpio/for-current&id=b41ba2ec54a70908067034f139aa23d0dd2985ce 4) create a new tag 5) send PR to Linus T again Yes, it will mess up the history, but it will fix the issue. -- With Best Regards, Andy Shevchenko
