headers
Stephen Rothwell | 1 Nov 2011 01:58
Picon
Picon

linux-next: build failure after merge of the crypto-current tree

Hi Herbert,

After merging the crypto-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:

  GEN     /scratch/sfr/x86_64_allmodconfig/Makefile
scripts/kconfig/conf --allmodconfig Kconfig
net/Kconfig:5:error: recursive dependency detected!
net/Kconfig:5:	symbol NET is selected by CRYPTO_USER
crypto/Kconfig:103:	symbol CRYPTO_USER depends on CRYPTO
crypto/Kconfig:15:	symbol CRYPTO is selected by BT
net/bluetooth/Kconfig:5:	symbol BT depends on NET
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has
unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects
ETHERNET which has unmet direct dependencies (NETDEVICES && NET)
#
# configuration written to .config
#
WITHOUT_DISTCC: 
ARCH=x86_64
CCVER=4.6
net/Kconfig:5:error: recursive dependency detected!
net/Kconfig:5:	symbol NET is selected by CRYPTO_USER
crypto/Kconfig:103:	symbol CRYPTO_USER depends on CRYPTO
crypto/Kconfig:15:	symbol CRYPTO is selected by BT
net/bluetooth/Kconfig:5:	symbol BT depends on NET
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has
unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects
(Continue reading)

Permalink | Reply | 13 comments |
headers
Herbert Xu | 1 Nov 2011 02:11
Picon
Picon

Re: linux-next: build failure after merge of the crypto-current tree

On Tue, Nov 01, 2011 at 11:58:51AM +1100, Stephen Rothwell wrote:
> Hi Herbert,
> 
> After merging the crypto-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
>   GEN     /scratch/sfr/x86_64_allmodconfig/Makefile
> scripts/kconfig/conf --allmodconfig Kconfig
> net/Kconfig:5:error: recursive dependency detected!
> net/Kconfig:5:	symbol NET is selected by CRYPTO_USER
> crypto/Kconfig:103:	symbol CRYPTO_USER depends on CRYPTO
> crypto/Kconfig:15:	symbol CRYPTO is selected by BT
> net/bluetooth/Kconfig:5:	symbol BT depends on NET
> warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has
unmet direct dependencies (NET)
> warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects
ETHERNET which has unmet direct dependencies (NETDEVICES && NET)

Hmm, don't know why I didn't see that here.

Does making it a dependency cause this to go away?

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 259dea9..527a857 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
 <at>  <at>  -102,8 +102,8  <at>  <at>  config CRYPTO_MANAGER2

 config CRYPTO_USER
 	tristate "Userspace cryptographic algorithm configuration"
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Nov 2011 04:10
Picon
Picon

linux-next: manual merge of the logfs tree with Linus' tree

Hi all,

Today's linux-next merge of the logfs tree got a conflict in
fs/logfs/file.c between commit 02c24a82187d ("fs: push i_mutex and
filemap_write_and_wait down into ->fsync() handlers") from Linus' tree
and commit 39da12ef4bbe ("logfs: take write mutex lock during fsync and
sync") from the logfs tree.

I have no idea what needs to be done here.  I fixed it like below to make
it build, but a better fix is needed.
-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc fs/logfs/file.c
index b548c87,f85d603..0000000
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
 <at>  <at>  <at>  -219,20 -219,13 +219,22  <at>  <at>  <at>  long logfs_ioctl(struct file *file, uns
  	}
  }

 -int logfs_fsync(struct file *file, int datasync)
 +int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
  {
  	struct super_block *sb = file->f_mapping->host->i_sb;
 +	struct inode *inode = file->f_mapping->host;
 +	int ret;
 +
 +	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
(Continue reading)

Permalink | Reply | 3 comments |
headers
Stephen Rothwell | 1 Nov 2011 04:43
Picon
Picon

linux-next: manual merge of the kbuild tree with the tree

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/Kconfig (drivers/net/stmmac/Kconfig
in the kbuild tree) between commit 7ac6653a085b ("stmmac: Move the
STMicroelectronics driver") from the  tree and commit 2d3def0b73e3
("stmmac: drop unused Kconfig symbol") from the kbuild tree.

I just used the latter version.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Nov 2011 05:23
Picon
Picon

Re: linux-next: build failure after merge of the crypto-current tree

Hi Herbert,

On Tue, 1 Nov 2011 11:58:51 +1100 Stephen Rothwell <sfr <at> canb.auug.org.au> wrote:
>
> Presumbly caused by commit ea8bdfcff175 ("crypto: user - Add dependency
> on NET").
> 
> I have used the crypto-current tree from next-20111025 for today (i.e. that
> commit has not been added to linux-next today).

Same problem and solution in the crypto tree (obviously).
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 2 comments |
headers
Herbert Xu | 1 Nov 2011 06:18
Picon
Picon

Re: linux-next: build failure after merge of the crypto-current tree

On Tue, Nov 01, 2011 at 03:23:12PM +1100, Stephen Rothwell wrote:
> Hi Herbert,
> 
> On Tue, 1 Nov 2011 11:58:51 +1100 Stephen Rothwell <sfr <at> canb.auug.org.au> wrote:
> >
> > Presumbly caused by commit ea8bdfcff175 ("crypto: user - Add dependency
> > on NET").
> > 
> > I have used the crypto-current tree from next-20111025 for today (i.e. that
> > commit has not been added to linux-next today).
> 
> Same problem and solution in the crypto tree (obviously).

So did the change to depends_on fix it?

Thanks,
--

-- 
Email: Herbert Xu <herbert <at> gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 1 Nov 2011 06:19
Picon
Picon

linux-next: manual merge of the mfd tree with the arm-soc tree

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-omap2/board-omap3beagle.c between commit be7324605873
("ARM: OMAP2+: Remove custom init_irq for remaining boards") from the
arm-soc tree and commit 935bac2b14b0 ("arm: BeagleBoard: add support for
the twl4030-madc") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 70261bc,0d68c8d..0000000
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
 <at>  <at>  <at>  -444,6 -445,23 +445,11  <at>  <at>  <at>  static struct platform_device keys_gpi
  	},
  };

 -static void __init omap3_beagle_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
 -				  mt46h32m32lf6_sdrc_params);
 -}
 -
 -static void __init omap3_beagle_init_irq(void)
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Nov 2011 07:00
Picon
Picon

linux-next: build failure after merge of the edac tree

Hi Mauro,

After merging the edac tree, today's linux-next build (x86_64
allmodconfig) failed like this:

arch/x86/kernel/cpu/mcheck/mce.c:39:28: fatal error: linux/edac_mce.h: No such file or directory

Caused by commit cdaf4f4e563c ("i7core_edac: Drop the edac_mce
facility").  This commit removed the file include/linux/edac_mce.h which
is still metioned by the above file (and MAINTAINERS).  Grep is your
friend.

I have used the version of the edac tree from next-20111025 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 3 comments |
headers
Stephen Rothwell | 1 Nov 2011 06:37
Picon
Picon

linux-next: build failure after merge of the watchdog tree

Hi Wim,

After merging the watchdog tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_start':
drivers/watchdog/wm831x_wdt.c:56:40: error: 'struct watchdog_device' has no member named 'priv'
drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_stop':
drivers/watchdog/wm831x_wdt.c:79:40: error: 'struct watchdog_device' has no member named 'priv'
drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_ping':
drivers/watchdog/wm831x_wdt.c:102:40: error: 'struct watchdog_device' has no member named 'priv'
drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_set_timeout':
drivers/watchdog/wm831x_wdt.c:144:40: error: 'struct watchdog_device' has no member named 'priv'
drivers/watchdog/wm831x_wdt.c: In function 'wm831x_wdt_probe':
drivers/watchdog/wm831x_wdt.c:215:12: error: 'struct watchdog_device' has no member named 'parent'
drivers/watchdog/wm831x_wdt.c:216:12: error: 'struct watchdog_device' has no member named 'priv'

Caused by commit 5b04099edc42 ("watchdog: Convert wm831x driver to
watchdog core").

I have used the version of the watchdog tree from next-20111025 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 1 Nov 2011 07:02
Picon
Picon

Re: linux-next: build failure after merge of the crypto-current tree

Hi Herbert,

On Tue, 1 Nov 2011 16:18:10 +1100 Herbert Xu <herbert <at> gondor.apana.org.au> wrote:
>
> So did the change to depends_on fix it?

I have not yet had time to test that ...

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 0 comments |

Gmane