On Mon, Jan 19, 2015 at 12:56:28PM +1030, Rusty Russell wrote:> "Michael S. Tsirkin" <mst at redhat.com> writes: > > Hi Rusty, all > > > > I parked outstanding virtio patches here: > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next > > this way they are merged in linux-next as well. > > > > Rusty if you'll be doing 3.20 window, would you mind > > checking that tree to verify nothing's lost? > > Hi Michael, > > Thanks, now I've returned from linux.conf.au, I'm starting to > organize the 3.20 queue. I've merged this branch into my virtio-next > branch. > > Cheers, > Rusty.Thanks, good to know. I tweaked some patches since due to test failure reports by Gerd. Updated patches are tagged "post-squash", if you want to see what changed, see fixup patches in the series tagged "pre-squash". Or you can look at my tree: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git virtio-next is pre-squash. git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next is post-squash. -- MST
"Michael S. Tsirkin" <mst at redhat.com> writes:> On Mon, Jan 19, 2015 at 12:56:28PM +1030, Rusty Russell wrote: >> "Michael S. Tsirkin" <mst at redhat.com> writes: >> > Hi Rusty, all >> > >> > I parked outstanding virtio patches here: >> > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next >> > this way they are merged in linux-next as well. >> > >> > Rusty if you'll be doing 3.20 window, would you mind >> > checking that tree to verify nothing's lost? >> >> Hi Michael, >> >> Thanks, now I've returned from linux.conf.au, I'm starting to >> organize the 3.20 queue. I've merged this branch into my virtio-next >> branch. >> >> Cheers, >> Rusty. > > Thanks, good to know. > I tweaked some patches since due to test failure reports by Gerd. > Updated patches are tagged "post-squash", if you want to see what > changed, see fixup patches in the series tagged "pre-squash". > > Or you can look at my tree: > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git virtio-next > is pre-squash. > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next > is post-squash.OK, I merged your vhost-next with my virtio-next, and the merge was empty. So we're up-to-date. Please send patches against my virtio-next from now on. Thanks, Rusty.
On Thu, Jan 22, 2015 at 11:29:44AM +1030, Rusty Russell wrote:> "Michael S. Tsirkin" <mst at redhat.com> writes: > > On Mon, Jan 19, 2015 at 12:56:28PM +1030, Rusty Russell wrote: > >> "Michael S. Tsirkin" <mst at redhat.com> writes: > >> > Hi Rusty, all > >> > > >> > I parked outstanding virtio patches here: > >> > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next > >> > this way they are merged in linux-next as well. > >> > > >> > Rusty if you'll be doing 3.20 window, would you mind > >> > checking that tree to verify nothing's lost? > >> > >> Hi Michael, > >> > >> Thanks, now I've returned from linux.conf.au, I'm starting to > >> organize the 3.20 queue. I've merged this branch into my virtio-next > >> branch. > >> > >> Cheers, > >> Rusty. > > > > Thanks, good to know. > > I tweaked some patches since due to test failure reports by Gerd. > > Updated patches are tagged "post-squash", if you want to see what > > changed, see fixup patches in the series tagged "pre-squash". > > > > Or you can look at my tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git virtio-next > > is pre-squash. > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-next > > is post-squash. > > OK, I merged your vhost-next with my virtio-next, and the merge was > empty. > > So we're up-to-date. Please send patches against my virtio-next from > now on. > > Thanks, > Rusty.Will do, thanks! -- MST