From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933534AbdCVCnj (ORCPT ); Tue, 21 Mar 2017 22:43:39 -0400 Received: from ale.deltatee.com ([207.54.116.67]:42282 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933227AbdCVCnh (ORCPT ); Tue, 21 Mar 2017 22:43:37 -0400 To: Stephen Rothwell , Greg KH , Arnd Bergmann , Jarkko Sakkinen References: <20170322131319.6278c15d@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Bottomley , Jason Gunthorpe From: Logan Gunthorpe Message-ID: <081d6fe2-b7bd-0b80-be71-09df0be5cd96@deltatee.com> Date: Tue, 21 Mar 2017 20:43:28 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170322131319.6278c15d@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 63.149.67.7 X-SA-Exim-Rcpt-To: jgunthorpe@obsidianresearch.com, James.Bottomley@HansenPartnership.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, jarkko.sakkinen@linux.intel.com, arnd@arndb.de, greg@kroah.com, sfr@canb.auug.org.au X-SA-Exim-Mail-From: logang@deltatee.com Subject: Re: linux-next: manual merge of the char-misc tree with the tpmdd tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks Stephen, I've reviewed the merge and it looks correct to me. On 21/03/17 08:13 PM, Stephen Rothwell wrote: > I fixed it up (I hope, 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. Jarko and Jason both reviewed and were aware of my patch. No one mentioned James' work or the potential for conflict. Logan