Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932188AbbKMBGL (ORCPT ); Thu, 12 Nov 2015 20:06:11 -0500 Received: from ozlabs.org ([103.22.144.67]:38319 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747AbbKMBGI (ORCPT ); Thu, 12 Nov 2015 20:06:08 -0500 Date: Fri, 13 Nov 2015 12:06:05 +1100 From: Stephen Rothwell To: "Nicholas A. Bellinger" , James Bottomley Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the target-merge tree with the scsi tree Message-ID: <20151113120605.267e2627@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; 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 Content-Length: 641 Lines: 16 Hi Nicholas, Today's linux-next merge of the target-merge tree got conflicts in several files. It looks like a newer version of all the commits in the target-merge tree has been applied to the scsi tree, so I just dropped the target-merge tree for today. You might like to tidy it up with respect to the current scsi tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/