From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07EF9ECE565 for ; Tue, 18 Sep 2018 07:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7BB620867 for ; Tue, 18 Sep 2018 07:27:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7BB620867 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728859AbeIRM67 (ORCPT ); Tue, 18 Sep 2018 08:58:59 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:41056 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727228AbeIRM67 (ORCPT ); Tue, 18 Sep 2018 08:58:59 -0400 X-IronPort-AV: E=Sophos;i="5.53,389,1531810800"; d="scan'208";a="20888123" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 18 Sep 2018 00:27:40 -0700 Received: from [10.159.245.112] (10.10.76.4) by chn-sv-exch02.mchp-main.com (10.10.76.38) with Microsoft SMTP Server id 14.3.352.0; Tue, 18 Sep 2018 00:27:39 -0700 Subject: Re: linux-next: manual merge of the staging tree with the at91 tree To: Stephen Rothwell , Greg KH , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches CC: Linux-Next Mailing List , Linux Kernel Mailing List , Marcus Folkesson , Kent Gustavsson References: <20180918131238.2838bedd@canb.auug.org.au> From: Nicolas Ferre Organization: microchip Message-ID: <982f3fea-27f7-2349-51dc-24e34ef7176e@microchip.com> Date: Tue, 18 Sep 2018 09:27:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180918131238.2838bedd@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 18/09/2018 at 05:12, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > MAINTAINERS > > between commit: > > 5ae2f1f30197 ("MAINTAINERS: move former ATMEL entries to proper MICROCHIP locatioat91n") > > from the at91 tree and commit: > > 010de20412fc ("MAINTAINERS: Add entry for mcp3911 ADC driver") > > from the staging 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. Resolution looks good to me. Thanks. Best regards, -- Nicolas Ferre