From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: block tree build failure Date: Wed, 3 Sep 2008 09:07:24 +0200 Message-ID: <20080903070723.GL20055@kernel.dk> References: <20080903161526.636b6d0d.sfr@canb.auug.org.au> <20080903063419.GK20055@kernel.dk> <20080903000418.aa2434fe.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pasmtpa.tele.dk ([80.160.77.114]:55364 "EHLO pasmtpA.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950AbYICHH1 (ORCPT ); Wed, 3 Sep 2008 03:07:27 -0400 Content-Disposition: inline In-Reply-To: <20080903000418.aa2434fe.akpm@linux-foundation.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: Stephen Rothwell , linux-next@vger.kernel.org, Tejun Heo On Wed, Sep 03 2008, Andrew Morton wrote: > On Wed, 3 Sep 2008 08:34:21 +0200 Jens Axboe wrote: > > > On Wed, Sep 03 2008, Stephen Rothwell wrote: > > > Hi Jens, > > > > > > Today's linux-next build (powerpc ppc64_defconfig) failed like this: > > > > > > block/genhd.c: In function 'show_partition': > > > block/genhd.c:718: error: 'struct hd_struct' has no member named 'private' > > > block/genhd.c:719: warning: passing argument 1 of 'seq_puts' from incompatible pointer type > > > block/genhd.c:720: error: 'struct hd_struct' has no member named 'private' > > > > > > Caused by the merge because commit > > > ddef43a843f620c6742a06633739887a901ec06b ("block: restore original > > > behavior of /proc/partition when there's no partition") added references > > > to the 'private' member. I removed the offending section of code (see > > > below) assuming the fix referred to in the comment has be done in the > > > block tree. > > > > I'm in the very midst of updating to latest -git, I'll push it out in 5 > > minutes or so. It'll also solve the two latest conflicts you saw. > > > > I get a nasty git reject around disk_seqf_next() from -next-20080902 > and have yet to find a fix which doesn't oops all over the place. > > Am presently discommoded. Please let this be fixed in -next-20080903 :( I've updated for-2.6.28 (and thus for-next and for-akpm), we also had a couple of merge errors that resulted in bad bisect compiles. So I think it should be ok now. -- Jens Axboe