From: Sasha Levin <sashal@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@microsoft.com, linux-hyperv@vger.kernel.org,
kys@microsoft.com, Stephen Hemminger <sthemmin@microsoft.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Hyper-V commits for 5.4-rc
Date: Wed, 30 Oct 2019 09:31:49 -0400 [thread overview]
Message-ID: <20191030133149.GN1554@sasha-vm> (raw)
In-Reply-To: <CAHk-=wgx_pSBtvmQE9zuNB6aoP52z601SG1pQDtrhm9ZMHNPMw@mail.gmail.com>
On Wed, Oct 30, 2019 at 02:15:08PM +0100, Linus Torvalds wrote:
>On Wed, Oct 30, 2019 at 12:37 PM Sasha Levin <sashal@kernel.org> wrote:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git tags/hyperv-fixes-signed
>
>No, Sasha, I'm not pulling this.
>
>It's completely broken garbage.
It is, appologies!
>You already sent me two of those fixes earlier, and they got pulled in
>commit 56c642e2aa1c ("Merge tag 'hyperv-fixes-signed' of
>git://git.kernel.org/pub/scm/linux/kernel/git/hyper>") two weeks ago.
>
>Fine - of the three fixes you claim, I could do this pull, and get at
>least one of them.
>
>Except YOU HAVE REBASED your branch, so I see the other two fixes that
>I already got as duplicates.
>
>WHY?
Honestly, I forgot that I sent you those two commits two weeks ago, but
still - you must be asking yourself why the heck would he rebase those,
right?
As I was working on the branch a few days ago I messed up and killed my
-fixes branch accidentally. To fix that I figured I'll just pick up
those 3 fixes again from my mailbox since they're grouped so nicely
over there and I haven't sent them to you yet.
Except that I did. And now they ended up with different IDs.
I then did a merge attempt before sending them to you, expecting that
things would blow up if I messed something up, but it didn't because the
commits themselves are identical, so I haven't noticed it then either.
Anyway, sorry about this, I'll resend it with just the relevant fix.
--
Thanks,
Sasha
prev parent reply other threads:[~2019-10-30 13:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 11:37 [GIT PULL] Hyper-V commits for 5.4-rc Sasha Levin
2019-10-30 13:15 ` Linus Torvalds
2019-10-30 13:31 ` Sasha Levin [this message]
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=20191030133149.GN1554@sasha-vm \
--to=sashal@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=torvalds@linux-foundation.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.