From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D17DDC38142 for ; Thu, 19 Jan 2023 10:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229598AbjASKLh convert rfc822-to-8bit (ORCPT ); Thu, 19 Jan 2023 05:11:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbjASKLg (ORCPT ); Thu, 19 Jan 2023 05:11:36 -0500 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D3EA768A; Thu, 19 Jan 2023 02:11:35 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 61F9B80F1; Thu, 19 Jan 2023 10:11:34 +0000 (UTC) Date: Thu, 19 Jan 2023 12:11:33 +0200 From: Tony Lindgren To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , ARM , Juerg Haefliger , Juerg Haefliger , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree Message-ID: References: <20230110095041.0d6311d2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: <20230110095041.0d6311d2@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org * Stephen Rothwell [230109 22:57]: > 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. Thanks, I just dropped "ARM: omap1: remove unused board files" to simplify things. Juerg, care to update and resend in a few weeks after v6.3-rc1 after the omap1 clean-up patches are merged? Regards, Tony From mboxrd@z Thu Jan 1 00:00:00 1970 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 518ACC00A5A for ; Thu, 19 Jan 2023 10:12:37 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EEctSARhIPEqJ3Iv69HbSiGJsoftKZqzrOaHsIVWgss=; b=ae5gwdgoUjtcjl t07bOHFrZOdzdrPK2hosQa5+eXAoCRIhYiuioQKmCRfoCb6o3IYfMmEnlcXdoPGfYHihjnZtNXtwE hsE8yTguClTJ8KaPI0iJUJTtCapaithMU/5eLolKvuC5VhEW0AloHCtBlbXjCC7hCHtXlI/lS4zBT PU9M8c52bWMB5KUUUEKcJ08jYNZFNfB55lSgH4+gKdE0WTwmEPh8tknXA6Dj7vljpFLQFVRbDul0A vfQEybvJ1e6fldyuqtjOrl25JDrhj+ba6SZ9stfnZH/hdRAuBhdXYjmxJjwn8kv4u8GLqQw6+6p+g RKUZot9BNMzeTCI5Re3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIRtV-004OTj-Mf; Thu, 19 Jan 2023 10:11:41 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIRtS-004OSC-BN for linux-arm-kernel@lists.infradead.org; Thu, 19 Jan 2023 10:11:39 +0000 Received: from localhost (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 61F9B80F1; Thu, 19 Jan 2023 10:11:34 +0000 (UTC) Date: Thu, 19 Jan 2023 12:11:33 +0200 From: Tony Lindgren To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , ARM , Juerg Haefliger , Juerg Haefliger , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree Message-ID: References: <20230110095041.0d6311d2@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230110095041.0d6311d2@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230119_021138_470903_1C3541A6 X-CRM114-Status: GOOD ( 14.38 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org * Stephen Rothwell [230109 22:57]: > 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. Thanks, I just dropped "ARM: omap1: remove unused board files" to simplify things. Juerg, care to update and resend in a few weeks after v6.3-rc1 after the omap1 clean-up patches are merged? Regards, Tony _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel