From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbdBTCvh (ORCPT ); Sun, 19 Feb 2017 21:51:37 -0500 Received: from ozlabs.org ([103.22.144.67]:36899 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043AbdBTCve (ORCPT ); Sun, 19 Feb 2017 21:51:34 -0500 Date: Mon, 20 Feb 2017 13:51:31 +1100 From: Stephen Rothwell To: Bart Van Assche , "Nicholas A. Bellinger" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Varun Prakash Subject: linux-next: manual merge of the target-bva tree with the target-updates tree Message-ID: <20170220135131.617bfef4@canb.auug.org.au> 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 Bart, Today's linux-next merge of the target-bva tree got conflicts in: drivers/target/iscsi/cxgbit/cxgbit_target.c drivers/target/iscsi/iscsi_target.c include/target/iscsi/iscsi_transport.h between commits: 9a584bf9bf0a ("target/iscsi: split iscsit_check_dataout_hdr()") 79e57cfe00f4 ("target/cxgbit: add T6 iSCSI DDP completion feature") from the target-updates tree and commit: b6f2cd5ab404 ("target/iscsi: split iscsit_check_dataout_hdr()") b0d5eab94c37 ("target/cxgbit: add T6 iSCSI DDP completion feature") from the target-bva tree. I fixed it up (the target-update versions are updates from the others, so I used those) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell