Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751241AbdH1GtS (ORCPT ); Mon, 28 Aug 2017 02:49:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:49513 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837AbdH1GtR (ORCPT ); Mon, 28 Aug 2017 02:49:17 -0400 X-ME-Sender: X-Sasl-enc: 4rAYUYTuCP6ljMUkFBxcCmZF4UaMxvt+4jOcwK32FN+2 1503902956 Date: Mon, 28 Aug 2017 08:49:21 +0200 From: Greg KH To: Stephen Rothwell Cc: James Bottomley , Linux-Next Mailing List , Linux Kernel Mailing List , Hannes Reinecke , "Martin K. Petersen" , Sameer Wadgaonkar Subject: Re: linux-next: manual merge of the scsi tree with the staging tree Message-ID: <20170828064921.GA24696@kroah.com> References: <20170828164127.15902025@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170828164127.15902025@canb.auug.org.au> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 900 Lines: 27 On Mon, Aug 28, 2017 at 04:41:27PM +1000, Stephen Rothwell wrote: > Hi James, > > Today's linux-next merge of the scsi tree got a conflict in: > > drivers/staging/unisys/visorhba/visorhba_main.c > > between commits: > > 781facd05eb9 ("staging: unisys: visorhba: visorhba_main.c: fixed comment formatting issues") > > from the staging tree and commit: > > 7bc4e528d9f6 ("scsi: visorhba: sanitze private device data allocation") > > from the scsi tree. > > I fixed it up (see below) 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. Ick, messy merge, thanks for doing this. greg k-h