From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235Ab1LPGMy (ORCPT ); Fri, 16 Dec 2011 01:12:54 -0500 Received: from mail.linux-iscsi.org ([67.23.28.174]:39051 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402Ab1LPGMw (ORCPT ); Fri, 16 Dec 2011 01:12:52 -0500 Subject: Re: linux-next: build failure after merge of the target-merge tree From: "Nicholas A. Bellinger" To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bart Van Assche , Christoph Hellwig , target-devel In-Reply-To: <20111215132902.d0a90a93696702e09b0c60bf@canb.auug.org.au> References: <20111215132902.d0a90a93696702e09b0c60bf@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Date: Thu, 15 Dec 2011 22:12:43 -0800 Message-ID: <1324015963.28227.3.camel@haakon2.linux-iscsi.org> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2011-12-15 at 13:29 +1100, Stephen Rothwell wrote: > Hi Nicholas, > > After merging the target-merge tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/infiniband/ulp/srpt/ib_srpt.c:48:39: fatal error: target/target_core_device.h: No such file or directory > > Caused by commit e0d85e515640 ("ib_srpt: Initial SRP Target merge for > v3.2-rc1") interacting with commit c4795fb20edf ("target: header > reshuffle, part2") from the target-updates tree which removed > include/target/target_core_device.h. > > I tried to figure out what set of include files is now needed, but > couldn't easily, so I have dropped the target-merge tree for today. > Hi Steven, My apologies for the extra breakage. for-next-merge has been rebased to for-next, and now includes the proper v3.3 include/target/ headers in ib_srpt. Thanks! --nab