From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: linux-next: manual merge of the staging tree with the target-merge tree
Date: Fri, 20 Jul 2012 11:14:04 -0700 [thread overview]
Message-ID: <1342808044.25472.28.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <20120720180358.GA9134@kroah.com>
On Fri, 2012-07-20 at 11:03 -0700, Greg KH wrote:
> On Fri, Jul 20, 2012 at 10:52:58AM -0700, Nicholas A. Bellinger wrote:
> > Hi Greg,
> >
<SNIP>
> -- a/drivers/staging/Kconfig
> > > > +++ b/drivers/staging/Kconfig
> > > > @@@ -132,6 -132,8 +132,10 @@@ source "drivers/staging/ipack/Kconfig
> > > >
> > > > source "drivers/staging/gdm72xx/Kconfig"
> > > >
> > > > + source "drivers/staging/csr/Kconfig"
> > > > +
> > > > + source "drivers/staging/omap-thermal/Kconfig"
> > > > +
> > > > +source "drivers/vhost/Kconfig.tcm"
> > >
> > > Why is someone putting a non drivers/staging/ Kconfig file here in
> > > drivers/staging/Kconfig? That's not ok at all.
> > >
> > > Target people, please just depend on CONFIG_STAGING if you want to do
> > > that, but don't mess with files in the drivers/staging/ directory for no
> > > good reason at all.
> > >
> >
> > This was a request from MST (CC'ed) in order to have TCM_VHOST show up
> > under the staging configuration options..
>
> If you really want it to show up there, then send me a patch adding the
> code to drivers/staging/. Otherwise it really makes no sense.
>
<nod>
> > If that's really not what should be done, I'm happy to drop this part
> > and just use CONFIG_STAGING again.
>
> Why are you wanting to depend on CONFIG_STAGING in the first place?
> What is wrong with the code that it can't be merged "properly" now?
> Don't use CONFIG_STAGING as a "crutch" unless you really need it.
>
This was a request by MST because we've not agreed on the upstream
userspace bits yet, so he asked to mark this code as STAGING so that it
can be removed if we can't end up agreeing with the QEMU folks.
At this point I don't see why we can't work out of userspace bits, but
MST preferred adding the STAGING bit for tcm_vhost to just to be sure.
--nab
next prev parent reply other threads:[~2012-07-20 18:14 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 [this message]
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
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=1342808044.25472.28.camel@haakon2.linux-iscsi.org \
--to=nab@linux-iscsi.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sfr@canb.auug.org.au \
/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).