linux-kernel - linux-next: manual merge of the staging tree with the target-merge tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120719145301.b8992aa986b47d7c44651710@canb.auug.org.au>
Date:	Thu, 19 Jul 2012 14:53:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicholas Bellinger <nab@...ux-iscsi.org>
Subject: linux-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
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.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"
 +
  endif # STAGING

Content of type "application/pgp-signature" skipped