* linux-next: build failure after merge of the target-merge tree
@ 2011-12-15 2:29 Stephen Rothwell
2011-12-15 11:26 ` Bart Van Assche
2011-12-16 6:12 ` Nicholas A. Bellinger
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2011-12-15 2:29 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: linux-next, linux-kernel, Bart Van Assche, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the target-merge tree
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
2011-12-16 6:12 ` Nicholas A. Bellinger
1 sibling, 2 replies; 5+ messages in thread
From: Bart Van Assche @ 2011-12-15 11:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Nicholas A. Bellinger, linux-next, linux-kernel,
Christoph Hellwig
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)
?
Bart.
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c
b/drivers/infiniband/ulp/srpt/ib_srpt.c
index c9503b8..0eb1fcc 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -45,13 +45,8 @@
#include <target/configfs_macros.h>
#include <target/target_core_base.h>
#include <target/target_core_base.h>
-#include <target/target_core_device.h>
+#include <target/target_core_fabric.h>
#include <target/target_core_fabric_configfs.h>
-#include <target/target_core_fabric_lib.h>
-#include <target/target_core_fabric_ops.h>
-#include <target/target_core_tmr.h>
-#include <target/target_core_tpg.h>
-#include <target/target_core_transport.h>
#include <target/target_core_configfs.h>
#include "ib_srpt.h"
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the target-merge tree
2011-12-15 11:26 ` Bart Van Assche
@ 2011-12-16 0:55 ` Stephen Rothwell
2011-12-16 6:14 ` Nicholas A. Bellinger
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2011-12-16 0:55 UTC (permalink / raw)
To: Bart Van Assche
Cc: Nicholas A. Bellinger, linux-next, linux-kernel,
Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Hi Bart,
On Thu, 15 Dec 2011 12:26:49 +0100 Bart Van Assche <bvanassche@acm•org> wrote:
>
> The (untested) patch below allowed me to make ib_srpt build again. By
I used that patch as a merge fix up today.
> 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)
> ?
It not in the target-merge tree that I have in linux-next.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the target-merge tree
2011-12-15 11:26 ` Bart Van Assche
2011-12-16 0:55 ` Stephen Rothwell
@ 2011-12-16 6:14 ` Nicholas A. Bellinger
1 sibling, 0 replies; 5+ messages in thread
From: Nicholas A. Bellinger @ 2011-12-16 6:14 UTC (permalink / raw)
To: Bart Van Assche
Cc: Stephen Rothwell, linux-next, linux-kernel, Christoph Hellwig,
target-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the target-merge tree
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 6:12 ` Nicholas A. Bellinger
1 sibling, 0 replies; 5+ messages in thread
From: Nicholas A. Bellinger @ 2011-12-16 6:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bart Van Assche, Christoph Hellwig,
target-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-16 6:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-12-16 6:12 ` Nicholas A. Bellinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox