From patchwork Mon Jul 11 08:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12913100 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8AF02C43334 for ; Mon, 11 Jul 2022 08:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=+DtVTV1L8SU/GGGJKlePxfduwDfKg/GKxXNWQSc+1qU=; b=Cf/ m+PbzaefsCMG+yb4hqUVIguCx8ixY0z1RT6R+nI0C41AZRrV8HwH/m+1xWf+PWh6KxagYh1TQNdXe mElmYTa/5S+fzxlzp9JuSjffu+avxBeIp8OooillzzFMf9ZgtdMdNJYIlnqLE1BvP1SLlL5tGFbWh HgrYX3odbfat1trTz3xg/J6THDUYJnbw8vyVtAxjsrAQH9hr0uhDvxiHzU1N8J08nYY2pPXds9Xgd xs1gsIpUWNtOYbvKYjWGnq2T1UL2zDJCw2/EiQu+zSv3tKf/6J9biriSksmVoDi9yP33/9Mo7wqZG FJOi38fWHHETk5noEwlZUM4DatrWblg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAoZ7-00H8GE-PG; Mon, 11 Jul 2022 08:14:49 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAoZ4-00H88e-2H for linux-arm-kernel@lists.infradead.org; Mon, 11 Jul 2022 08:14:47 +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 4LhGrK2MPwz4xbn; Mon, 11 Jul 2022 18:14:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657527266; bh=h+M4Jcz3tcEssYonG7T7apPq9JSRl1tVYCyueBu9jkw=; h=Date:From:To:Cc:Subject:From; b=qhiBd0dOxF+c3g6GKDSUuFXHSb5ZZG7Mem9THLspP5WD1/CfVWSj+4DM0OReU7u/P hDTRi1zOqwIZZ58Z6/ZFaOeueruoQPlP2mgUxTjBjeV2R1I9WiCDWu23rKoBPQuOz8 vIGHnAtryfWaUH5rwraQbcDamUiN6zjoYVIeKWVldgCcBbt0/O4VKN5+EON26coUEd PjfpTNwGQNfQYxaPGIW9vcapv63QaVfcZJ8pznXFwP8v6wSzHt0RZiM+mazdNJslmj gJ8VLF0oHRPfDrVPn6sqVQ6gM/l8eTtsJesLBdVBNvFmIsi6t5HGLStZoaXH01qqKQ IzOoXmHKsFVtQ== Date: Mon, 11 Jul 2022 18:14:24 +1000 From: Stephen Rothwell To: Alexandre Belloni , Olof Johansson , Arnd Bergmann Cc: ARM , Conor Dooley , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rtc tree with the arm-soc-fixes tree Message-ID: <20220711181424.70195b52@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_011446_409655_F34EDB51 X-CRM114-Status: GOOD ( 15.43 ) 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 rtc tree got a conflict in: MAINTAINERS between commit: 2058dc831ff8 ("MAINTAINERS: add polarfire rng, pci and clock drivers") from the arm-soc-fixes tree and commit: 1bdb08c180e8 ("MAINTAINERS: add PolarFire SoC's RTC") from the rtc 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 MAINTAINERS index 2f618be2906f,69a960561e37..000000000000 --- a/MAINTAINERS