From patchwork Mon Jan 9 22:50:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13094489 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 C6062C54EBD for ; Mon, 9 Jan 2023 22:51:48 +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=taJ4gYiAqV+S3sklWl70lZ27XcLMF/FvrHSEG7hXs/M=; b=sQ8 xXXzgoWb7EZIuOh2pbFNFfRNuBGWJ8HQ0HTCob1uCxtoCmXWtE6Y8bRjYsDJR5C9amB5rCwV5hqvC z0xzp7V+NsR8cr7dFe+qODYEVtZAuCz4suZjZlf0dED34fHzHZ5/2puh3uHJyXRr4wB6H3kWEyFqQ LjFRefF6+Wzp8UbWRsk/sDq6yei35IzHwaRwSePIMwBmslhbd9UwjvK34gFvfIxKI71rvQ0Wpr1pU vKOJkOBnhVo2myiCWL7Feq/fhWzIuSiqrtskiLsTd/MFs00lHFuAmlfOAwgVN4FBzF/0ukcqNonE/ MwjinZGtizQ3lUzpWsKMvKI7D2CB/zw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pF0yf-004Xsd-6d; Mon, 09 Jan 2023 22:50: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 1pF0yc-004Xrg-1E for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2023 22:50: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 4NrTgQ4M6pz4wgv; Tue, 10 Jan 2023 09:50:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1673304643; bh=OvKztsoerse6l8exOnVHdWYPzP2a9WMO26vPOE1nJZA=; h=Date:From:To:Cc:Subject:From; b=n7wLU0kgho/TtH9pLKnEv8ZY/uVMn5QyIobxSvSqrXWQaf9ufiuoqXyIY+WJP5XYu lgDGLysG8/fyEVCWmZcGSV7xGe1Q43QG6StCWDRrIX05UKjlaaiJP0Mru3J1SmijrQ Dzau+tFWO5c6Cp2SpDcHyelY8dSk15TcenYyQo6N/0kFA7MVSKCsJfPIOZaJV2q+6G aty5Th7GB9PFaLR8sh+BBIQh//IMkZNCBFcORCDfs+q6m8C/mdjj/5pkBvmV2+n9tV UHNsCyTYrrRqyGcnMuoqtm8hOYMXA5Bbfhw1LBmZ1mAJVjGjyqMPYAse7vk0ZFG9pa 0KQYcHGkQxIMQ== Date: Tue, 10 Jan 2023 09:50:41 +1100 From: Stephen Rothwell To: Tony Lindgren , Olof Johansson , Arnd Bergmann Cc: ARM , Juerg Haefliger , Juerg Haefliger , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the omap tree with the arm-soc tree Message-ID: <20230110095041.0d6311d2@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230109_145046_523685_CA28FBD5 X-CRM114-Status: GOOD ( 18.66 ) 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 omap tree got a conflict in: arch/arm/mach-omap1/Kconfig between commit: 67d3928c3df5 ("ARM: omap1: remove unused board files") from the arm-soc tree and commit: 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation") from the omap 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-omap1/Kconfig index 8df9a4de0e79,f833526aa7cd..000000000000 --- a/arch/arm/mach-omap1/Kconfig