linux-kernel - linux-next: manual merge of the wireless-next tree with Linus' 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>] [day] [month] [year] [list]

Message-Id: <20130725113709.210d2157219410a4ff119510@canb.auug.org.au>
Date:	Thu, 25 Jul 2013 11:37:09 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hauke Mehrtens <hauke@...ke-m.de>,
	David Miller <davem@...emloft.net>
Subject: linux-next: manual merge of the wireless-next tree with Linus' tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/ethernet/broadcom/Kconfig between commit 31bd29776b85
("bgmac: add dependency to phylib") from Linus' tree and commit
72bb2f267887 ("bgmac: make bgmac depend on bcm47xx") from the
wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/ethernet/broadcom/Kconfig
index 52c9603,7b839bf..0000000
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@@ -130,8 -130,7 +130,8 @@@ config BNX2X_SRIO
  
  config BGMAC
  	tristate "BCMA bus GBit core support"
- 	depends on BCMA_HOST_SOC && HAS_DMA
+ 	depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
 +	select PHYLIB
  	---help---
  	  This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
  	  They can be found on BCM47xx SoCs and provide gigabit ethernet.

Content of type "application/pgp-signature" skipped