From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076AbcAHEfA (ORCPT ); Thu, 7 Jan 2016 23:35:00 -0500 Received: from ozlabs.org ([103.22.144.67]:46697 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544AbcAHEe6 (ORCPT ); Thu, 7 Jan 2016 23:34:58 -0500 Date: Fri, 8 Jan 2016 15:34:57 +1100 From: Stephen Rothwell To: "Nicholas A. Bellinger" , Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Or Gerlitz Subject: linux-next: manual merge of the target-updates tree with the rdma tree Message-ID: <20160108153457.2e08bfdf@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 a conflict in: drivers/infiniband/ulp/isert/ib_isert.c between commit: 4a061b287b1e ("IB/ulps: Avoid calling ib_query_device") from the rdma tree and commit: 373a4cd73782 ("iser-target: Fix non negative ERR_PTR isert_device_get usage") from the target-updates tree. I fixed it up (the former removed the code fixed up by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/