All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Larry Finger <Larry.Finger@lwfinger.net>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: linux-next: manual merge of the staging tree with Linus' tree
Date: Wed, 9 Dec 2009 16:34:35 +1100	[thread overview]
Message-ID: <20091209163435.244f7f1f.sfr@canb.auug.org.au> (raw)

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/vt6655/Kconfig and drivers/staging/vt6656/Kconfig between
commit 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper
selection of WIRELESS_EXT and WEXT_PRIV") from Linus' tree and commit
a0d2ec259009d9378343697af84636f1e16c2421 ("Staging: vt6x depends on
WLAN") from the staging tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/vt6655/Kconfig
index 825bbc4,ed51d7c..0000000
--- a/drivers/staging/vt6655/Kconfig
+++ b/drivers/staging/vt6655/Kconfig
@@@ -1,8 -1,6 +1,8 @@@
  config VT6655
     tristate "VIA Technologies VT6655 support"
-    depends on PCI
 -   depends on WIRELESS_EXT && PCI && WLAN
++   depends on PCI && WLAN
 +   select WIRELESS_EXT
 +   select WEXT_PRIV
     ---help---
     This is a vendor-written driver for VIA VT6655.
  
diff --cc drivers/staging/vt6656/Kconfig
index 87bcd26,fcde661..0000000
--- a/drivers/staging/vt6656/Kconfig
+++ b/drivers/staging/vt6656/Kconfig
@@@ -1,8 -1,6 +1,8 @@@
  config VT6656
  	tristate "VIA Technologies VT6656 support"
- 	depends on USB
 -	depends on WIRELESS_EXT && USB && WLAN
++	depends on USB && WLAN
 +	select WIRELESS_EXT
 +	select WEXT_PRIV
  	---help---
  	This is a vendor-written driver for VIA VT6656.
  

             reply	other threads:[~2009-12-09  5:34 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-09  5:34 Stephen Rothwell [this message]
2009-12-09 20:30 ` linux-next: manual merge of the staging tree with Linus' tree Greg KH
2009-12-09 23:08   ` Stephen Rothwell
2011-04-08  5:47 Stephen Rothwell
2011-04-08 20:55 ` Greg KH
2011-04-13 19:18 ` Greg KH
2011-04-08  5:51 Stephen Rothwell
2011-04-08  5:54 Stephen Rothwell
2011-04-08  5:57 Stephen Rothwell
2011-04-08  6:00 Stephen Rothwell
2011-04-08  6:02 Stephen Rothwell
2011-04-28  2:59 Stephen Rothwell
2011-04-28  3:06 ` Greg KH
2011-05-13  4:08 Stephen Rothwell
2011-05-13 23:12 ` Greg KH
2011-09-20  6:46 Stephen Rothwell
2011-09-20 12:53 ` Greg KH
2011-11-28  4:18 Stephen Rothwell
2011-11-28  5:13 ` Greg KH
2012-02-10  4:47 Stephen Rothwell
2012-02-10  5:30 ` Greg KH
2012-02-10  4:48 Stephen Rothwell
2012-02-10  5:30 ` Greg KH
2012-02-14 21:31   ` Ramirez Luna, Omar
2012-02-14 22:37     ` Greg KH
2012-02-14 23:33       ` Ramirez Luna, Omar
2012-02-14 23:42         ` Greg KH
2012-02-10 19:01 ` Greg KH
2012-04-27  4:37 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2012-05-02 21:23 ` Greg KH
2013-01-17  2:35 Stephen Rothwell
2013-01-18  0:42 ` Greg KH
2013-03-15  4:13 Stephen Rothwell
2013-03-15 15:01 ` Greg KH
2014-09-22  5:01 Stephen Rothwell
2014-09-22 14:31 ` Greg KH
2016-04-05  3:49 Stephen Rothwell
2016-04-11 16:57 ` Greg KH
2018-02-23  2:28 Stephen Rothwell
2018-02-23  9:49 ` Greg KH
2018-06-06  9:08 Stephen Rothwell
2018-06-06  9:10 ` Greg KH
2018-06-06  9:12 Stephen Rothwell
2018-06-06  9:47 ` Greg KH
2020-07-20  5:25 Stephen Rothwell
2020-07-20  7:37 ` Greg KH

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=20091209163435.244f7f1f.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Larry.Finger@lwfinger.net \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.