On Fri, Dec 12, 2014 at 08:07:05AM +1100, Stephen Rothwell wrote:> Hi Michael, > > On Thu, 11 Dec 2014 14:02:48 +0200 "Michael S. Tsirkin" <mst at redhat.com> wrote: > > > > The following changes since commit b2776bf7149bddd1f4161f14f79520f17fc1d71d: > > > > Linux 3.18 (2014-12-07 14:21:05 -0800) > > hmmm ... > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus > > > > for you to fetch changes up to 803cd18f7b5e6c7ad6bee9571ae8f4450190ab58: > > > > virtio_ccw: finalize_features error handling (2014-12-09 16:32:41 +0200) > > > > Note: some net drivers are affected by these patches. > > David said he's fine with merging these patches through > > my tree. > > Rusty's on vacation, he acked using my tree for these, too. > > So, either none of this has been in linux-next or you have just rebased > it all on top of v3.18 ...It was on linux next for a while, then I wanted to tweak the commit log for some messages a bit. So since I rewrote the history anyway, I went ahead and rebased it on v3.18, after this rebase it's been in linux-next for several days.> -- > Cheers, > Stephen Rothwell sfr at canb.auug.org.au
Hi Michael, On Fri, 12 Dec 2014 00:01:57 +0200 "Michael S. Tsirkin" <mst at redhat.com> wrote:> > It was on linux next for a while, then I wanted to tweak the commit log > for some messages a bit. > So since I rewrote the history anyway, I went ahead and rebased it > on v3.18, after this rebase it's been in linux-next for several days.Maybe you think you pushed it into a linux-next included branch (or maybe you think I am fetching a branch that I am not), but when I look at those commits in my tree (as I fetch Linus' tree into mine) none of them precede any of the next-* tags ... I am not doubting that these patches have been published and reviewed and tested, all I am saying is that they have not been in linux-next as those commits. -- Cheers, Stephen Rothwell sfr at canb.auug.org.au -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: <http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20141212/c2258d21/attachment.sig>
On Fri, Dec 12, 2014 at 10:24:26AM +1100, Stephen Rothwell wrote:> Hi Michael, > > On Fri, 12 Dec 2014 00:01:57 +0200 "Michael S. Tsirkin" <mst at redhat.com> wrote: > > > > It was on linux next for a while, then I wanted to tweak the commit log > > for some messages a bit. > > So since I rewrote the history anyway, I went ahead and rebased it > > on v3.18, after this rebase it's been in linux-next for several days. > > Maybe you think you pushed it into a linux-next included branch (or > maybe you think I am fetching a branch that I am not),Oh. I thought linux-next is pulling vhost-next, when in fact it turns out it's pulling it's own linux-next branch. So it looks like I didn't update that branch in a while - now I see why it's a bit so quiet. It's probably best to keep it at linux-next branch, as it is: I've tweaked my push rules to update that branch now, and pushed again. Thanks a lot for letting me know!> but when I look > at those commits in my tree (as I fetch Linus' tree into mine) none of > them precede any of the next-* tags ... > > I am not doubting that these patches have been published and reviewed > and tested, all I am saying is that they have not been in linux-next > as those commits.You are right of course.> -- > Cheers, > Stephen Rothwell sfr at canb.auug.org.au