[lkml]   [2012]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the staging tree with the target-merge tree
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
Stephen Rothwell

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"
endif # STAGING
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-07-19 07:21    [W:0.058 / U:6.152 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site