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 DB8A6C6FD1D for ; Fri, 17 Mar 2023 07:51:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230316AbjCQHvf convert rfc822-to-8bit (ORCPT ); Fri, 17 Mar 2023 03:51:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbjCQHvc (ORCPT ); Fri, 17 Mar 2023 03:51:32 -0400 Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB008F71C; Fri, 17 Mar 2023 00:51:30 -0700 (PDT) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.95) with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1pd4s0-000c8p-Tf; Fri, 17 Mar 2023 08:51:24 +0100 Received: from dynamic-078-055-143-011.78.55.pool.telefonica.de ([78.55.143.11] helo=[192.168.1.11]) by inpost2.zedat.fu-berlin.de (Exim 4.95) with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1pd4s0-002izB-N2; Fri, 17 Mar 2023 08:51:24 +0100 Message-ID: <2749830124ec9d6990c95bf2ce4ea4de56b2967a.camel@physik.fu-berlin.de> Subject: Re: [PATCH 5/7 v4] sh: remove sh5/sh64 last fragments From: John Paul Adrian Glaubitz To: Geert Uytterhoeven Cc: Randy Dunlap , linux-kernel@vger.kernel.org, Arnd Bergmann , Rich Felker , Yoshinori Sato , linux-sh@vger.kernel.org Date: Fri, 17 Mar 2023 08:51:23 +0100 In-Reply-To: References: <50863bc8642d52f1533ad5809ae2dcd690e2493b.camel@physik.fu-berlin.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 78.55.143.11 X-ZEDAT-Hint: PO Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Geert! On Fri, 2023-03-17 at 08:31 +0100, Geert Uytterhoeven wrote: > Hi Adrian, > > On Thu, Mar 16, 2023 at 9:46 PM John Paul Adrian Glaubitz > wrote: > > On Thu, 2023-03-16 at 13:43 -0700, Randy Dunlap wrote: > > > > Oops, sorry. My bad. I will use the proper tree. > > > > > > Just let me know if you want me to resend it. > > > Thanks. > > > > No, that's fine. I will rebase my for-next tree. > > Rebase on top of what? Commit 49deed336ef9a409 ("parisc: > update kbuild doc. aliases for parisc64") is in the parisc tree. > You must not base the SH tree on the parisc tree. Oh, I wasn't aware of that. > Don't care about the simple conflict, Stephen and Linus can > handle that fine. > > FTR, if the conflict was more complex, an immutable branch to be > merged by all parties would be appropriate. But that's overkill and > thus not needed for simple conflicts like this. I'll resolve the conflict manually then. Thanks. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913