From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754876AbbHDDfc (ORCPT ); Mon, 3 Aug 2015 23:35:32 -0400 Received: from ozlabs.org ([103.22.144.67]:42351 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753967AbbHDDfa (ORCPT ); Mon, 3 Aug 2015 23:35:30 -0400 Date: Tue, 4 Aug 2015 13:35:27 +1000 From: Stephen Rothwell To: "Nicholas A. Bellinger" , Tejun Heo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sagi Grimberg Subject: linux-next: manual merge of the target-updates tree with the libata tree Message-ID: <20150804133527.7d300005@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-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/scsi/scsi_error.c include/scsi/scsi_eh.h between commit: fe16d4f202c5 ("Revert "libata-eh: Set 'information' field for autosense"") from the libata tree and commit: 7708c1656552 ("scsi: Move sense handling routines to scsi_common") from the target-updates tree. I fixed it up (I left scsi_set_sense_information in its new place) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au