From: Greg KH <greg@kroah.com>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefan Hajnoczi <stefanha@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Anthony Liguori <anthony@codemonkey.ws>,
Zhi Yong Wu <wuzhy@cn.ibm.com>,
David Miller <davem@davemloft.net>,
kvm-devel <kvm@vger.kernel.org>,
target-devel <target-devel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the target-merge tree
Date: Mon, 23 Jul 2012 08:16:53 -0700 [thread overview]
Message-ID: <20120723151653.GB19236@kroah.com> (raw)
In-Reply-To: <1342993463.25472.265.camel@haakon2.linux-iscsi.org>
On Sun, Jul 22, 2012 at 02:44:23PM -0700, Nicholas A. Bellinger wrote:
> So Linus has merged target-pending/for-next this afternoon, so now we
> are just waiting on net-next to hit mainline with the vhost patches
> already ACK'ed by MST. Hopefully that makes things easier for you to
> considering taking tcm_vhost upstream via staging. ;)
>
> Also, MST asked for an RFC-v5 for the initial merge commit with some
> minor debug wrapper changes that will be going out next week. This will
> include a move into drivers/staging/tcm_vhost/ against a rebased
> staging.git patch with the necessary -rc0 mainline dependencies.
>
> Please let me know if your OK with this, otherwise I'll just plan to
> keep -v5 against target-pending/for-next-merge for now, and send a GIT
> PULL after MST gets back from holiday on the 29th -> 30th.
I have no idea what any of the above three paragraphs are asking for, or
talking about, sorry.
Note, the merge window is closed for taking new stuff into the staging
tree. If it isn't already in my staging-next tree, it isn't going to go
into 3.6 unless it's bug fixes, sorry. How about we figure all of this
out after 3.6-rc1 is out so we can understand what is going on for 3.7?
thanks,
greg k-h
next prev parent reply other threads:[~2012-07-23 15:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-19 4:53 linux-next: manual merge of the staging tree with the target-merge tree Stephen Rothwell
2012-07-19 23:55 ` Greg KH
2012-07-20 17:52 ` Nicholas A. Bellinger
2012-07-20 18:03 ` Greg KH
2012-07-20 18:14 ` Nicholas A. Bellinger
2012-07-20 18:42 ` Michael S. Tsirkin
2012-07-20 23:12 ` Nicholas A. Bellinger
2012-07-22 2:07 ` Greg KH
2012-07-22 21:44 ` Nicholas A. Bellinger
2012-07-23 15:16 ` Greg KH [this message]
2012-07-23 19:47 ` Nicholas A. Bellinger
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=20120723151653.GB19236@kroah.com \
--to=greg@kroah.com \
--cc=anthony@codemonkey.ws \
--cc=davem@davemloft.net \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=nab@linux-iscsi.org \
--cc=pbonzini@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=stefanha@gmail.com \
--cc=target-devel@vger.kernel.org \
--cc=wuzhy@cn.ibm.com \
/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 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).