From patchwork Sun Jan 29 22:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13120253 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 AD650C05027 for ; Sun, 29 Jan 2023 22:59:15 +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=M7Sb+cvdfT5c4AZVFOpCWyVrL9RY6rUs8sQV31YMPMQ=; b=OT6 OdiaOuakSTZWXbo2akPZCI3ylkfONjGGTAY45KnaRN/K0t8iK0RE22r4N7RBu4Kh+UwDWYhaUnapa PLIbGI2hFmCIHC4Fa+Uj64TH/ESUFHXe9sGVcvYYyMCnhES53nM2eUe9jg60AqW6vWeow/hl2pvHM iKZhaTHO50V7ZuLPiytfwBUkKwqRCvDYYv/H25kMDmiplgzSLdjqiUe3l++EwqDXXxlMthph3hLse E3wJl02JQfA5Qa6sYYBzW+Fg8JZEYlKnl0J5hPeu/ip3IZc6zs2RWdrfbI1uABCzOcBA6APNMXFsg 2ycV58iRmZ7LWAMrKXjwrZUIrBhkbbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMGbU-001zIs-Li; Sun, 29 Jan 2023 22:56:52 +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 1pMGbQ-001zIV-OM for linux-arm-kernel@lists.infradead.org; Sun, 29 Jan 2023 22:56:50 +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 4P4ms328zVz4x2c; Mon, 30 Jan 2023 09:56:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675033001; bh=gbyszc1FJYVufykExUphRGi7MXMQQUMbTAeAOCiv0eU=; h=Date:From:To:Cc:Subject:From; b=XzJ7i5wce8XxxbZck8vZ0tFhsQpEZ4DRNI/llces4akj7Y0rpXJxWQUj9P6uPfAIR IkledSw/PzVTlvZdzKuVgB1L2IACSp1cTOyuYp8ZsVd+3y3+/X4VYK6pe9w8WkE76B j6VWwPVXvtzrsUh9abY3KctDC9PdcZV/Aqpdn1Tdc+AscvK8O4VQSB5KuN+n2A0rmG cK+Pt84mq9HeYQiNM+K/1xWXqEW7t4KgsKFgCmftSmbjirkA8yKaNeTJ0A3tj8DF1I I8hAxlXLoeFf4GgzgYFW75uz183BEQPAICagTzdHOioRyKDln2sAU/FU6TDvDsDZvS 4e7iR3oqMfJ/Q== Date: Mon, 30 Jan 2023 09:56:38 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Masahiro Yamada Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the arm-soc tree with the kbuild tree Message-ID: <20230130095638.72fdea23@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230129_145649_159749_1605BBD9 X-CRM114-Status: GOOD ( 15.31 ) 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: arch/arm/mach-s3c/Makefile between commit: 608d67522f28 ("kbuild: remove --include-dir MAKEFLAG from top Makefile") from the kbuild tree and commits: 61b7f8920b17 ("ARM: s3c: remove all s3c24xx support") 1ea35b355722 ("ARM: s3c: remove s3c24xx specific hacks") 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 arch/arm/mach-s3c/Makefile index deb44326b828,988c49672715..000000000000 --- a/arch/arm/mach-s3c/Makefile