Message ID | 20200603173857.1345-1-pbonzini@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [GIT,PULL] First batch of KVM changes for Linux 5.8 | expand |
On Wed, Jun 3, 2020 at 10:39 AM Paolo Bonzini <pbonzini@redhat.com> wrote: > > There could be minor conflicts depending on the order you're processing 5.8 > pull requests. It would have been good if you had actually pointed to the reports from linux-next. As it was, the hyper-v pull request did do that (thanks Wei Liu), so I could verify my merge against what had been reported and this didn't take me by surprise, but it would have good to see that kind of detail from the kvm pull too.. Linus
The pull request you sent on Wed, 3 Jun 2020 13:38:57 -0400:
> https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/039aeb9deb9291f3b19c375a8bc6fa7f768996cc
Thank you!
On 04/06/20 00:17, Linus Torvalds wrote: > On Wed, Jun 3, 2020 at 10:39 AM Paolo Bonzini <pbonzini@redhat.com> wrote: >> There could be minor conflicts depending on the order you're processing 5.8 >> pull requests. > It would have been good if you had actually pointed to the reports > from linux-next. > > As it was, the hyper-v pull request did do that (thanks Wei Liu), so I > could verify my merge against what had been reported and this didn't > take me by surprise, but it would have good to see that kind of detail > from the kvm pull too.. Ok, I'll keep it in mind. Based on today's report from Stephen, you will get also a conflict with the s390 tree, and a semantic change (build failure) when Thomas sends his large IRQ rework, due to the removal of the second argument to do_machine_check. Paolo