Re: linux-next: build failure after merge of the target-merge tree

[Bart Van Assche]

On Thu, Dec 15, 2011 at 3:29 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx/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"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/