LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Steve French <smfrench@gmail.com>
Cc: CIFS <linux-cifs@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] CIFS/SMB3 fixes
Date: Wed, 8 May 2019 13:46:44 -0700	[thread overview]
Message-ID: <CAHk-=wiZd2cLsobjBWU6_YZo2RWWqAm_fVzLpPQsh+yoG7fk-w@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wiKoePP_9CM0fn_Vv1bYom7iB5N=ULaLLz7yOST3K+k5g@mail.gmail.com>

On Wed, May 8, 2019 at 1:37 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> So don't do the whole "rebase the day before" in the first place, but
> *DEFINITELY* don't do it when you then pick a random and bad point to
> rebase things on top of!

I've pulled, but I really hope this never happens again.

You could have rebased your work on top of 5.1 if you needed to.

Or you could have just tried to avoid rebasing in the first place.

But picking a random commit that was the top-of-the-tree on the second
day of the merge window (pretty much when things are at their most
chaotic) is just about the worst thing you can do.

I'm considering adding some automation to my pull requests to warn
about craziness like this. Because maybe you've consistently done
something like this in the past, and I've just not noticed how crazy
the pull request was.

               Linus

  reply	other threads:[~2019-05-08 20:47 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 18:32 Steve French
2019-05-08 20:37 ` Linus Torvalds
2019-05-08 20:46   ` Linus Torvalds [this message]
2019-05-08 21:47   ` Steve French
2019-05-08 20:45 ` pr-tracker-bot
  -- strict thread matches above, loose matches on Subject: below --
2021-11-25  4:31 [GIT PULL] cifs/smb3 fixes Steve French
2021-11-25 19:12 ` pr-tracker-bot
2021-11-19 22:45 Steve French
2021-11-20 19:20 ` pr-tracker-bot
2021-08-13 21:41 [GIT PULL] CIFS/SMB3 Fixes Steve French
2021-08-14  1:12 ` pr-tracker-bot
2021-07-30 21:09 [GIT PULL] CIFS/SMB3 fixes Steve French
2021-07-31 16:32 ` pr-tracker-bot
2021-07-17  0:17 [GIT PULL] CIFS/SMB3 Fixes Steve French
2021-07-17 20:13 ` pr-tracker-bot
2021-06-28 23:52 Steve French
2021-06-30  3:35 ` pr-tracker-bot
2021-05-05 14:22 Steve French
2021-05-05 20:49 ` pr-tracker-bot
2021-03-28  0:07 Steve French
2021-03-28 19:11 ` pr-tracker-bot
2021-03-20 16:18 Steve French
2021-03-20 18:06 ` pr-tracker-bot
2021-03-20 16:17 Steve French
2021-02-26  6:24 Steve French
2021-02-26 22:24 ` pr-tracker-bot
2020-12-20 19:47 Steve French
2020-12-21  4:45 ` pr-tracker-bot
2020-08-03 22:45 Steve French
2020-08-07  2:39 ` pr-tracker-bot
2020-07-04  3:44 Steve French
2020-07-04  7:00 ` pr-tracker-bot
2020-06-13 20:37 Steve French
2020-06-13 20:50 ` pr-tracker-bot
2020-04-26 14:23 Steve French
2020-04-26 19:20 ` pr-tracker-bot
2020-04-12  2:26 [GIT PULL] cifs/smb3 fixes Steve French
2020-04-12 17:25 ` pr-tracker-bot
2020-03-31 19:14 [GIT PULL] CIFS/SMB3 fixes Steve French
2020-03-31 21:50 ` pr-tracker-bot
2020-03-19  4:51 Steve French
2020-03-19 17:03 ` Linus Torvalds
2020-03-19 17:15   ` Steve French
2020-03-19 17:25 ` pr-tracker-bot
2020-02-16  2:58 [GIT PULL] CIFS/SMB3 Fixes Steve French
2020-02-16 19:50 ` pr-tracker-bot
2020-02-09  1:45 Steve French
2020-02-09 21:30 ` pr-tracker-bot
2019-11-27 23:49 Steve French
2019-11-30 19:13 ` Linus Torvalds
2019-11-30 21:20   ` Steve French
2019-11-30 19:40 ` pr-tracker-bot
2019-10-27  2:40 Steve French
2019-10-27 11:30 ` pr-tracker-bot
2014-10-03 19:56 Steve French

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHk-=wiZd2cLsobjBWU6_YZo2RWWqAm_fVzLpPQsh+yoG7fk-w@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=smfrench@gmail.com \
    --subject='Re: [GIT PULL] CIFS/SMB3 fixes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).