From patchwork Fri Apr 23 03:22:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12219479 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 0DCFDC433B4 for ; Fri, 23 Apr 2021 03:24:54 +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 59ABB6121E for ; Fri, 23 Apr 2021 03:24:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59ABB6121E 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=tOiZF5uQgRaUCsfyxUtu3rsB6vU/HfqlrsMGTgdFd7c=; b=kS9 vkXS40DC287PsjmFyj0rMWrDsxk48qOMGi6WhaPyKWrebfslzg98tie/NpO6OuhY5pgfJGq+P2OsE Wr5c1mTnExhzJnRQFpNJA8E41AahhxgxJPnRcEYEwi9tsiE/N5YZPZrAs+zplttuGzT2QcGgyloCK gDU7d2h+HC23LuwifsXdJICNDYTFNGIUcJuscNYaEpjAVVd2xBrTYnDChQNPnSjVa/DTdIDheJ2c+ 0JtvWs8Ba0aE73KoO3I1cdUxTEExUWUSIC//9Ge3Eu0DpgztMrI41NkVq6evEfdEke4JWgO6bxv/C yf7A2I0bp2ffePT0/7rQvS9nCWaYC+A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZmP1-000S4O-QM; Fri, 23 Apr 2021 03:22:48 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZmOv-000S3F-40 for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 03:22:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=JNtnAp8QdV38EfVUnk8WZcLSo0tTj3mW9IzWwQLjz4M=; b=F58B8+JLlS8jlIc0Q6Wi9lctMi awccD3XxAeXJJuBZfym0OoHnJ1wEB1ML9gg9ZwCwyti1IBRyiizNJpNCXle/Df8kkGlSWPgtnJ39A ONJ4Wu8GEb79K3HJ5C/q+4rlS8ApiYRPeSjHMHTHEO/cTipD4lVN47pyykCys72qSdnqpfercgFTf p0N2hVUtyBET2f7mqSPrzrWmbFQbPvJSEYkzNZN52n87TFmZSJEImDwMBwhrpoM83Hfvw8LZSq1og sFhs7+w8LrH+g6IABNyIZw+smMC5kcqZFi02UNrgWxXCueY7t/aWrwENAbLE9wZ4QTF781YF9NPFO Q1NkvBHw==; Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZmOs-00E76t-4W for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 03:22:39 +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 4FRKNP1fvVz9sVq; Fri, 23 Apr 2021 13:22:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1619148153; bh=uCyNgkVFKWw9UAqrzW+EPAYN9Ec3dXolNTUn6QdcFsM=; h=Date:From:To:Cc:Subject:From; b=TE10UIgyv5vjpdrGv+mdoJwInFsNdf+KQI3Ij2guBk5mAaVM+GgzkCvbYI788goyD wKR+8LKeVmOFmdquZEkZIExqCZejGCnI/knPyzK1SPgTMi2XiQPSIOSNH/o3Ua6EZp DiYFVVjI2vV+Wgk8fBXH8q/nixT2L+vV+4AvCPUwAuKn0UQJRWQ0i0H18K+qqPk82x 3mZmUOQw3qSTkyU5sJObbvXrXrycv+0XRHRl9ba5T+pWC81G3bxhzn+6YHCY7y4DR9 27Dpwgy18WG8S4zmSM38JQwm/3RbBZUPwAOTPmdif0J9cMSTRstrVUXzNL/5LWvBNU O5L9ghw4Owmyw== Date: Fri, 23 Apr 2021 13:22:28 +1000 From: Stephen Rothwell To: Marc Zyngier , Olof Johansson , Arnd Bergmann , ARM Cc: Hector Martin , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Bogendoerfer Subject: linux-next: manual merge of the irqchip tree with the arm-soc tree Message-ID: <20210423132228.643253a5@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_202238_460933_F0C54EF6 X-CRM114-Status: GOOD ( 17.18 ) 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 commit: 529ea3681811 ("irqchip: Add support for IDT 79rc3243x interrupt controller") 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,18b0d0b33b8b..000000000000 --- a/drivers/irqchip/Kconfig diff --cc drivers/irqchip/Makefile index eb6a515f0f64,18573602a939..000000000000 --- a/drivers/irqchip/Makefile