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=-9.0 required=3.0 tests=BAYES_00,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0D0EAC4338F for ; Wed, 18 Aug 2021 19:59:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAFEB610A5 for ; Wed, 18 Aug 2021 19:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233061AbhHRUAB (ORCPT ); Wed, 18 Aug 2021 16:00:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:39738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233074AbhHRUAA (ORCPT ); Wed, 18 Aug 2021 16:00:00 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D544160720; Wed, 18 Aug 2021 19:59:25 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mGRid-005pft-JG; Wed, 18 Aug 2021 20:59:23 +0100 Date: Wed, 18 Aug 2021 20:59:22 +0100 Message-ID: <87pmuazfqd.wl-maz@kernel.org> From: Marc Zyngier To: Linus Walleij Cc: Stephen Rothwell , Jianqun Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the pinctrl tree with the irqchip tree In-Reply-To: References: <20210817200412.799bd992@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linus.walleij@linaro.org, sfr@canb.auug.org.au, jay.xu@rock-chips.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, 17 Aug 2021 21:14:35 +0100, Linus Walleij wrote: > > On Tue, Aug 17, 2021 at 12:04 PM Stephen Rothwell wrote: > > > Today's linux-next merge of the pinctrl tree got a conflict in: > > > > drivers/pinctrl/pinctrl-rockchip.c > > > > between commit: > > > > a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()") > > > > from the irqchip tree and commit: > > > > 9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes") > > > > from the pinctrl tree. > > > > I fixed it up (the latter removed the code changed by the former, so I > > did that) and can carry the fix as necessary. > > I have created an immutable branch for these changes: > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-rockchip > > If it helps irqchip they can pull this in (and fix things on top if > need be). Cheers Linus, I've pulled this branch in and resolved the conflict locally. Thanks, M. -- Without deviation from the norm, progress is not possible.