From patchwork Fri May 27 00:39:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12862945 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 04CB7C433F5 for ; Fri, 27 May 2022 00:41:03 +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=CIfCRwKaW0PFrUH3xE73P2FzXHUJ/+Sa/AxXJepamvA=; b=OSt uTgFcckDoDEt0+w7SZzraySwkchYvWDJAppugFPUcrJaBju4sqp5o68pmy75UR5wlA8lqsH/FkQvp OGmKa71i+279iM1YFSfzYOg8UNy3r6KVmXIVv1tUSK7JwCnu5UYb9kckzCI20cuII9z+vF06GDQH2 G9D+4sA40mOBoYIE84PUo2OTI6/uu1BZbRsK+XWQwHrxsMH4iup/ZZXpb+yPa2Nsnv5kd92/zLz0O wLPScw8Oc9jSBpCRlunx+B+UposR7VkR9oYpen3/DSs/TDKravp12aE6AUysLkqveDijrHqVOVQTT VMENQAL+MqdoRnl2aCblQcmamav/Wxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nuO0p-00GI2s-4F; Fri, 27 May 2022 00:39:31 +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 1nuO0m-00GI1l-0M for linux-arm-kernel@lists.infradead.org; Fri, 27 May 2022 00:39:29 +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 4L8Qsy71lrz4xDK; Fri, 27 May 2022 10:39:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653611961; bh=Urg5QK4WXDiWxbV0Ora75ObG3bel4emUqwm77YJPP/s=; h=Date:From:To:Cc:Subject:From; b=CWg5OK1jRA5dpywKbojkXHjQlBbzbjFVf5nFnRIpiB4fBdkgKzqkWcMLTh93QvmwM oHEItQWVWAJW/i7nHeq0Z4u46WNyimDCIhMTTGIMJF4PFLvostqqQkI6Pu5xQAI2Qh /164+AwMIVeR8xDsz/IZVYCpMy+et4jqRcQOgnflOVk2qfaC4dIXszV5xZgoje4cpy a1cqOh58KNTcKaYoLaskW44RRwVRQcbXUUIQaOkb0lJWqsQ33ipMEEtf6qZu1LeZr1 ZrRQ2aQMN38fyl8PASeRKBTq2rAzzcuIuzc0f1bu9Ef/rpH6EjodsbyrAzWt9zMdg9 elQ6BIkmLuUFA== Date: Fri, 27 May 2022 10:39:16 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM Cc: Geert Uytterhoeven , Laurent Vivier , Linux Kernel Mailing List , Linux Next Mailing List , Nick Hawkins Subject: linux-next: manual merge of the arm-soc tree with Linus' tree Message-ID: <20220527103916.52768f74@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220526_173928_280340_FB1CF457 X-CRM114-Status: GOOD ( 13.91 ) 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 arm-soc tree got a conflict in: drivers/clocksource/Makefile between commit: c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource") from Linus' tree and commit: 5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer") from the arm-soc 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/clocksource/Makefile index 833cfb7a96c1,98017abf6c03..000000000000 --- a/drivers/clocksource/Makefile