* [GIT PULL] Hyper-V commits for 5.4-rc
@ 2019-10-30 11:37 Sasha Levin
2019-10-30 13:15 ` Linus Torvalds
0 siblings, 1 reply; 3+ messages in thread
From: Sasha Levin @ 2019-10-30 11:37 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-hyperv, kys, sthemmin, linux-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
The following changes since commit 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c:
Linux 5.4-rc1 (2019-09-30 10:35:40 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git tags/hyperv-fixes-signed
for you to fetch changes up to 590c28b9199c99593b879cbb82d7d4be605894ec:
Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP (2019-10-28 12:24:53 -0400)
- ----------------------------------------------------------------
- - Fix a leak and improve the handling of the ring buffer in the Hyper-V
HID driver from Dexuan Cui.
- - Fix a (harmless) build warning in vmbus PM code by Dexuan Cui.
- - A fix for a build issue in the Hyper-V IOMMU driver resulting from
enablement on new architectures by Boqun Feng.
- ----------------------------------------------------------------
Boqun Feng (1):
drivers: iommu: hyperv: Make HYPERV_IOMMU only available on x86
Dexuan Cui (2):
HID: hyperv: Use in-place iterator API in the channel callback
Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP
drivers/hid/hid-hyperv.c | 56 +++++++++---------------------------------------
drivers/hv/vmbus_drv.c | 6 ++++++
drivers/iommu/Kconfig | 2 +-
3 files changed, 17 insertions(+), 47 deletions(-)
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAl25dZ0ACgkQ3qZv95d3
LNwEXg/+LjI3+t8Qw5rd2aaCU2NUEVTQJA1bMOx8HT62lKVhrbPT7Y3XZ+zP2K9P
fE6c3bHjTnSymrAx3XMNO2qAXYocA6fo3ggNVleTSA7zrh21fIR2XV0NVDoDNZ/d
KEU/kJbAMyVADKRlwnKA9+O+bfOQhvP4wDb3r1fKaKQ+HznEw8rrbQ0NgohGRO0i
85diHq3KUkXfGvh1PzkzeXGSuxMlmoM/ZtsjE+8Okj4NU0R3Wp0nd6kJzi2EwkDz
ZGmxLpV5Se+qilA7gUfayhSdYS0UyFO0BX+rONfKPdEOLwxVS81/5wROwtivJ2xJ
gMqfZg78X8yiqEkFEMfVngxoeARzJGcFYiqjl8iOGL57tU875Mz2yZgAx1PH0J4y
nZ86X44A13ZViOYlMwV0JG0h94FRtiab3PeVbLCXNU1ULSBJcppLP4lUxdVgeZyz
F9xS6RY35QaGxyT1/cb+g2qr//TAXPQaJh4vnh5vEx/U3lI86+IyCs0xuaOhKP06
frdoXOTdRmLZoqm7ruoCt4gTJUIGbYvGruisAVifdS0401UxXssIKoh1/1CHbBE6
1/bUofBwNrXtyfbru2VyROxRqb/uxZj+UECQwRqJkkg4JUOglBz08h+O+Rjie79i
PrUjPAwhUAKxQ19Cj59M+r6MlT5U9L/Fp2q/BODk1gu1jC3bRAM=
=UL+8
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [GIT PULL] Hyper-V commits for 5.4-rc 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 0 siblings, 1 reply; 3+ messages in thread From: Linus Torvalds @ 2019-10-30 13:15 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, linux-hyperv, kys, Stephen Hemminger, Linux Kernel Mailing List 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. 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? Stop this. Read the documentation on rebasing, and stop doing this kind of insane thing. Linus ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] Hyper-V commits for 5.4-rc 2019-10-30 13:15 ` Linus Torvalds @ 2019-10-30 13:31 ` Sasha Levin 0 siblings, 0 replies; 3+ messages in thread From: Sasha Levin @ 2019-10-30 13:31 UTC (permalink / raw) To: Linus Torvalds Cc: linux-kernel, linux-hyperv, kys, Stephen Hemminger, Linux Kernel Mailing List 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-30 13:31 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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).