From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752671AbcAGFmP (ORCPT ); Thu, 7 Jan 2016 00:42:15 -0500 Received: from ozlabs.org ([103.22.144.67]:56369 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbcAGFmN (ORCPT ); Thu, 7 Jan 2016 00:42:13 -0500 Date: Thu, 7 Jan 2016 16:42:12 +1100 From: Stephen Rothwell To: "Nicholas A. Bellinger" , Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Sagi Grimberg , Jenny Derzhavetz , Or Gerlitz Subject: linux-next: manual merge of the target-updates tree with the rdma tree Message-ID: <20160107164212.4cfbbe02@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Nicholas, Today's linux-next merge of the target-updates tree got conflicts in: drivers/infiniband/ulp/iser/iscsi_iser.h drivers/infiniband/ulp/iser/iser_initiator.c drivers/infiniband/ulp/iser/iser_memory.c drivers/infiniband/ulp/iser/iser_verbs.c drivers/infiniband/ulp/isert/ib_isert.c between commits: 4a061b287b1e ("IB/ulps: Avoid calling ib_query_device") cfeb91b375ad ("IB/iser: Convert to CQ abstraction") 2392a4cdcb8d ("IB/iser: constify iser_reg_ops structure") 422bd0acb062 ("IB/isert: Support the remote invalidation exception") 59caaed7a72a ("IB/iser: Support the remote invalidation exception") from the rdma tree and commit: ddca7d44ccd2 ("iser: Have initiator and target to share protocol structures and definitions") 6d2cb3ad4bc2 ("iser-target: Support the remote invalidation exception") c37c810bae45 ("IB/iser: Increment the rkey when registering and not when invalidating") 9a4a71456262 ("IB/iser: Support the remote invalidation exception") from the target-updates tree. I fixed it up (hopefully - mainly taking one of the other side (usually the rdma tree version, so please check the result when I release it) and can carry the fix as necessary (no action is required). Seom of these patches are very similar ... -- Cheers, Stephen Rothwell sfr@canb.auug.org.au