Hold your horses. Do you have confirmation from the affected party that the shims are adequate for them? I have been waiting for that before looking at this branch.
Is the iw_cxgbe breakage a simple merge conflict as previously discussed or do the shims require driver changes? If they don't then it should be possible to drop the iw_cxgbe from head into this branch and it should just work, is that correct? Regards, Navdeep On Fri, Mar 16, 2018 at 05:44:41PM +0100, Hans Petter Selasky wrote: > Hi, > > The bsd_rdma_4_9_stable_11 projects branch is close to being merged into > FreeBSD 11-stable. Mellanox plans to merge no later than 12:00 CEST TUE 20th > of March 2018, unless objections are received. > > A compatibility header file has been created, ib_verbs_compat.h, which > offers full source compatibility to existing OFED kernel applications, as a > response to the raised conserns. User-space compatibility is maintained > through library symbol versioning. > > https://svnweb.freebsd.org/base/projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_verbs_compat.h > > An example client for this header file can be found here: > > https://svnweb.freebsd.org/base/projects/bsd_rdma_4_9_stable_11/sys/contrib/rdma/krping_compat/ > > Currently the cxgb and cxgbe i-Warp drivers are not building, and will be > stubbed from the kernel build before the branch is merged, unless Chelsio > can add patches for these. > > Here is a quick and dirty patch to make the bsd_rdma_4_9_stable_11 branch > build: > > >diff --git a/sys/modules/Makefile b/sys/modules/Makefile > >index 6b005c854d7..b918a208f21 100644 > >--- a/sys/modules/Makefile > >+++ b/sys/modules/Makefile > >@@ -530,7 +530,7 @@ _txp= txp > > .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \ > > ${MACHINE_ARCH:C/mips(el)?/mips/} != "mips" && \ > > ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv" > >-_cxgbe= cxgbe > >+#_cxgbe= cxgbe > > .endif > > .if ${MK_TESTS} != "no" || defined(ALL_MODULES) > >@@ -554,7 +554,7 @@ _vpo= vpo > > _sym= sym > > # intr_disable() is a macro, causes problems > > .if ${MK_SOURCELESS_UCODE} != "no" > >-_cxgb= cxgb > >+#_cxgb= cxgb > > .endif > > .endif > > --HPS _______________________________________________ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
