Messages in this thread | | | Date | Mon, 9 Jul 2012 12:04:38 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the infiniband tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the infiniband tree got a conflict in drivers/infiniband/hw/ocrdma/ocrdma_main.c between commit 6ab6827ee999 ("RDMA/ocrdma: Fixed GID table for vlan and events") from Linus' tree and commit 898648347205 ("IB: Use IS_ENABLED(CONFIG_IPV6)") from the infiniband tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/infiniband/hw/ocrdma/ocrdma_main.c index b050e62,93c9462..0000000 --- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c @@@ -202,8 -197,7 +202,7 @@@ static int ocrdma_build_sgid_tbl(struc return 0; } - #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \ - defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) -#if IS_ENABLED(CONFIG_IPV6) ++#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_VLAN_8021Q) static int ocrdma_inet6addr_event(struct notifier_block *notifier, unsigned long event, void *ptr) [unhandled content-type:application/pgp-signature] | |