From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753380AbdLHKqm (ORCPT ); Fri, 8 Dec 2017 05:46:42 -0500 Received: from mga14.intel.com ([192.55.52.115]:3187 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbdLHKqh (ORCPT ); Fri, 8 Dec 2017 05:46:37 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,377,1508828400"; d="scan'208";a="1253093659" Date: Fri, 8 Dec 2017 12:46:33 +0200 From: Jarkko Sakkinen To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree Message-ID: <20171208104633.rnwemhajfp3uvqmc@linux.intel.com> References: <20171208132536.0c55270d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171208132536.0c55270d@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 08, 2017 at 01:25:35PM +1100, Stephen Rothwell wrote: > Hi Jarkko, > > Today's linux-next merge of the tpmdd tree got a conflict in: > > MAINTAINERS > > between commit: > > 60fdb44a23cb ("MAINTAINERS: update TPM driver infrastructure changes") > > from Linus' tree and commit: > > 510230d28445 ("tpm: Update MAINTAINERS for Jason Gunthorpe") > > from the tpmdd 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. > > -- > Cheers, > Stephen Rothwell Sorry, I'll remove this commit up until security tree is updated to 4.5-rcX. /Jarkko