linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicholas Bellinger <nab@linux-iscsi.org>
Subject: Re: linux-next: manual merge of the staging tree with the target-merge tree
Date: Thu, 19 Jul 2012 16:55:23 -0700	[thread overview]
Message-ID: <20120719235523.GA13623@kroah.com> (raw)
In-Reply-To: <20120719145301.b8992aa986b47d7c44651710@canb.auug.org.au>

On Thu, Jul 19, 2012 at 02:53:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/Kconfig between commit d0146d396bfa ("tcm_vhost: Initial
> merge for vhost level target fabric driver") from the target-merge tree
> and commit 15a4bc17b7f4 ("Staging: add CSR Wifi "os helper" module") from
> the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/staging/Kconfig
> index 67ec9fe,e3402d5..0000000
> --- 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.

thanks,

greg k-h

  reply	other threads:[~2012-07-19 23:55 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 [this message]
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
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=20120719235523.GA13623@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nab@linux-iscsi.org \
    --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).