From patchwork Fri Apr 9 05:52:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12193107 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=-8.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,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 777AEC433B4 for ; Fri, 9 Apr 2021 05:58:45 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 E9DEB610F7 for ; Fri, 9 Apr 2021 05:58:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9DEB610F7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=C0dfxemhK0IzS0pfLLEizJ+biV2NBVybFxsWYh2zcB0=; b=jxE yROKPd/4vB3yxIs2Kjipqk6guWL30+ZmKcJzOhDNJP5YCPEm4wvLN/lp8Np/MO3GBRw0elz6dCcLd FDaVjDRKawkjCFP5umzbanq3/xIthRpcz/IyPO3XqOU6CzFIHPtFkmzCQLSxXSdZLAF1xC8sdKD2Y 8Bc3kANJxp0fgO1jUfqkNi5FzQMIfhgxknHskx0fD0ODQSm6IfDVKPfCMQEGm5QbfZp2USi4hhmb0 E/f0jz22ZO3oMUMEDCj3Zm5VnTuyzCHQFVS3gFQ/5SeoGUAGfPuQolpM7nyUgjpsRKli1lyR4suGm E3PXVCr8M3JKEwGie9ABkM11Uu58New==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUk6U-00AE2j-Ue; Fri, 09 Apr 2021 05:55:01 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUk53-00ADoR-Ad for linux-arm-kernel@lists.infradead.org; Fri, 09 Apr 2021 05:53:26 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FGnNV3XZNz9sVt; Fri, 9 Apr 2021 15:52:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617947581; bh=IaFcgmo34MevFgJEiDdEWLgJGrX80AspYRHdVxy95BY=; h=Date:From:To:Cc:Subject:From; b=cBPvYJmvIGCfR+9UYo4jUbqUad9/KJK3Hv0AHpoK8+O/P9wm07eHZNL5uTiUEviCa dMDnrOQ3A3UKOg8JlWytJbrOKNOV+bAC3v5OtvTXBeYrVsEQe1mxk0P4IbKfahrHLZ sPn6a3QnZUxNEHI4hQH4L5De9pbuX+gn7bXc8g+lmQp6dbkvX43VMihk3mLWsUWLj5 n1r+McBbj/Xg99leTwejje8zP/Jd6JPiT1zIFnWlq7/XbWwlk5wDpGdnX/EdljqF5k o99A4wt9GNaRodn8hUp7T5ARqnQcyIq3itK8K7HWvZEkaj8HF5hgB1bfsYw8E+959n m0MaeSY3NqR5Q== Date: Fri, 9 Apr 2021 15:52:57 +1000 From: Stephen Rothwell To: Marc Zyngier , Olof Johansson , Arnd Bergmann , ARM Cc: Hector Martin , Jonathan =?utf-8?q?Neusch=C3=A4fer?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the irqchip tree with the arm-soc tree Message-ID: <20210409155257.47f66922@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210409_065322_495366_1D69D7AD X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the irqchip tree got conflicts in: drivers/irqchip/Kconfig drivers/irqchip/Makefile between commit: 76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller") from the arm-soc tree and commits: fead4dd49663 ("irqchip: Add driver for WPCM450 interrupt controller") 94bc94209a66 ("irqchip/wpcm450: Drop COMPILE_TEST") from the irqchip 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. diff --cc drivers/irqchip/Kconfig index d3a14f304ec8,715eb4366e35..000000000000 --- a/drivers/irqchip/Kconfig diff --cc drivers/irqchip/Makefile index eb6a515f0f64,bef57937e729..000000000000 --- a/drivers/irqchip/Makefile