From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc tree Date: Mon, 17 Dec 2018 11:40:29 -0800 Message-ID: <20181217194029.GZ6707@atomide.com> References: <20181217191753.172ca200@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20181217191753.172ca200@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Linus Walleij , Olof Johansson , Arnd Bergmann , ARM , Linux Next Mailing List , Linux Kernel Mailing List , Janusz Krzysztofik List-Id: linux-next.vger.kernel.org * Stephen Rothwell [181217 00:18]: > Hi all, > > Today's linux-next merge of the gpio tree got a conflict in: > > arch/arm/mach-omap1/board-ams-delta.c > > between commit: > > 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device") > > from the arm-soc tree and commit: > > 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()") > > from the gpio tree. > > I fixed it up (the former removed the code updated by the latter, so > I used that) 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. OK thank you. Regards, Tony 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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT 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 D883DC43387 for ; Mon, 17 Dec 2018 19:40:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6075206A2 for ; Mon, 17 Dec 2018 19:40:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="meuE3iWz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6075206A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2rmDzZhGPbeacmYC6VLjBOgHuUZh1EP1Ny3CJR2cZcQ=; b=meuE3iWzvrw+y9 AREmBuzAqJT+SzeaychcUKCHe8hlNzMPcfFED3M0hKBmyvds9R51PVqc74Q9oszRss4FNhoxXF+jI xBWIeknFVjd1e3WVQ6IEQcHC1gZFloQoK11sJ4aJTrjyMQreUpVyf1clHgQ/S2MKOUg4zSWnYOh4A fH+8R4Ko/2eK5nzkR5aqtMH9j1fqKa9Idak+iMTwUyHn8GjITvcTqOLfEfBOdojElKEyOi9wIc1XC PBy8nQ3CheNib4mAQOZ/Y+LpWv0hLxof1sKJzCcGPzdrx+PCzHMMwTzvn2a+IFGZs/0BMDECmZ10t GDjYdugkrQezETqOG3Mw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYykx-00008m-OG; Mon, 17 Dec 2018 19:40:47 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYyku-00007N-9V for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2018 19:40:45 +0000 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 9878D80DB; Mon, 17 Dec 2018 19:40:36 +0000 (UTC) Date: Mon, 17 Dec 2018 11:40:29 -0800 From: Tony Lindgren To: Stephen Rothwell Subject: Re: linux-next: manual merge of the gpio tree with the arm-soc tree Message-ID: <20181217194029.GZ6707@atomide.com> References: <20181217191753.172ca200@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181217191753.172ca200@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181217_114044_367697_DA47655D X-CRM114-Status: GOOD ( 11.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Linus Walleij , Janusz Krzysztofik , Linux Kernel Mailing List , Linux Next Mailing List , Olof Johansson , ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org * Stephen Rothwell [181217 00:18]: > Hi all, > > Today's linux-next merge of the gpio tree got a conflict in: > > arch/arm/mach-omap1/board-ams-delta.c > > between commit: > > 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device") > > from the arm-soc tree and commit: > > 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()") > > from the gpio tree. > > I fixed it up (the former removed the code updated by the latter, so > I used that) 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. OK thank you. Regards, Tony _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel