From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbcEBLKw (ORCPT ); Mon, 2 May 2016 07:10:52 -0400 Received: from mga09.intel.com ([134.134.136.24]:7471 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753614AbcEBLKn (ORCPT ); Mon, 2 May 2016 07:10:43 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,567,1455004800"; d="scan'208";a="944352894" Date: Mon, 2 May 2016 14:10:36 +0300 From: Jarkko Sakkinen To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christophe Ricard Subject: Re: linux-next: build failure after merge of the tpmdd tree Message-ID: <20160502111036.GA9585@intel.com> References: <20160428153232.0d6eb076@canb.auug.org.au> <1461834144.3482.4.camel@linux.intel.com> <20160501231222.42557edf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160501231222.42557edf@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, May 01, 2016 at 11:12:22PM +1000, Stephen Rothwell wrote: > Hi Jarkko, > > On Thu, 28 Apr 2016 12:02:24 +0300 Jarkko Sakkinen wrote: > > > > On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote: > > > Hi Jarkko, > > > > > > After merging the tpmdd tree, today's linux-next build (powerpc > > > allyesconfig) failed like this: > > > > > > In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0, > > >                  from /home/sfr/next/next/include/linux/idr.h:18, > > >                  from /home/sfr/next/next/include/linux/kernfs.h:14, > > >                  from /home/sfr/next/next/include/linux/sysfs.h:15, > > >                  from /home/sfr/next/next/include/linux/kobject.h:21, > > >                  from /home/sfr/next/next/include/linux/device.h:17, > > >                  from /home/sfr/next/next/include/linux/dma-mapping.h:6, > > >                  from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18: > > > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe': > > > /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do' > > >  do {       \ > > >  ^ > > > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro > > > 'spin_lock_init' > > >   spin_lock_init(&ibmvtpm->rtce_lock); > > >   ^ > > > > > > Caused by commit > > > > > >   28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific") > > > > > > A ';' was missed. > > > > > > I added the following patch for today. > > > > Sorry about this and thank you. > > > > /Jarkko > > > > > From: Stephen Rothwell > > > Date: Thu, 28 Apr 2016 15:27:17 +1000 > > > Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c > > > > > > Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific") > > > Signed-off-by: Stephen Rothwell > > > --- > > >  drivers/char/tpm/tpm_ibmvtpm.c | 2 +- > > >  1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c > > > index 6b22826f0e11..946025a7413b 100644 > > > --- a/drivers/char/tpm/tpm_ibmvtpm.c > > > +++ b/drivers/char/tpm/tpm_ibmvtpm.c > > > @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, > > >   > > >   crq_q->index = 0; > > >   > > > - dev_set_drvdata(&chip->dev, ibmvtpm) > > > + dev_set_drvdata(&chip->dev, ibmvtpm); > > >   > > >   spin_lock_init(&ibmvtpm->rtce_lock); > > >   > > > --  > > > 2.7.0 > > > > > Ping? Acked-by: Jarkko Sakkinen I applied the fix and merged it. > -- > Cheers, > Stephen Rothwell /Jarkko