public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
To: Bart Van Assche <bvanassche@acm•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Christoph Hellwig <hch@infradead•org>,
	target-devel <target-devel@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the target-merge tree
Date: Thu, 15 Dec 2011 22:14:49 -0800	[thread overview]
Message-ID: <1324016089.28227.5.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <CAO+b5-pyo=kR5JuWbQzMd6X70s4AwSWJV7dq3F9BvwLwTDPm7A@mail.gmail.com>

On Thu, 2011-12-15 at 12:26 +0100, Bart Van Assche wrote:
> On Thu, Dec 15, 2011 at 3:29 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > 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.
> 
> The (untested) patch below allowed me to make ib_srpt build again. By
> the way, has the patch "ib_srpt: Make compilation with BUG=n proceed"
> already been queued in the target-merge tree
> (http://www.mail-archive.com/linux-rdma@vger.kernel.org/msg10030.html)
> ?
> 

Hi Bart,

I've included the above along with the patch to fix breakage using v3.3
includes in for-next-merge with ib_srpt.

Thanks!

--nab

  parent reply	other threads:[~2011-12-16  6:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-15  2:29 linux-next: build failure after merge of the target-merge tree Stephen Rothwell
2011-12-15 11:26 ` Bart Van Assche
2011-12-16  0:55   ` Stephen Rothwell
2011-12-16  6:14   ` Nicholas A. Bellinger [this message]
2011-12-16  6:12 ` Nicholas A. Bellinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324016089.28227.5.camel@haakon2.linux-iscsi.org \
    --to=nab@linux-iscsi$(echo .)org \
    --cc=bvanassche@acm$(echo .)org \
    --cc=hch@infradead$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=target-devel@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox