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 2CEFDCD37B4 for ; Mon, 18 Sep 2023 01:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234098AbjIRB3K (ORCPT ); Sun, 17 Sep 2023 21:29:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234732AbjIRB27 (ORCPT ); Sun, 17 Sep 2023 21:28:59 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC40A116 for ; Sun, 17 Sep 2023 18:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695000491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CXfZQM0uVXNfHiLNlxxGdc5uA6LuWXlMtcyORQY/GI4=; b=eO7mJtzp6Wl7Y2ZLPbbb++6HmWxiTBECtnQGHyMwnjc9TF8oedQ+l7u2FMndvjJwMAClho LSbPVoA19uWl0DsIVfNlOw0g6GYwYX/yB+M6tIsZICwx8MwfcQCkHf8p3WYkClfzdFB2xX PsRJGsJruuyqZq7cIY9pUKMeZAZtYSQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-686-Dr8hJNEdPniUdnmgqm16NA-1; Sun, 17 Sep 2023 21:28:07 -0400 X-MC-Unique: Dr8hJNEdPniUdnmgqm16NA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F22C811E7B; Mon, 18 Sep 2023 01:28:07 +0000 (UTC) Received: from localhost (unknown [10.72.113.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FD5740C2064; Mon, 18 Sep 2023 01:28:05 +0000 (UTC) Date: Mon, 18 Sep 2023 09:28:02 +0800 From: Baoquan He To: Stephen Rothwell Cc: Arnd Bergmann , Andrew Morton , Ard Biesheuvel , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the asm-generic tree with the mm tree Message-ID: References: <20230918101027.7506b71e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230918101027.7506b71e@canb.auug.org.au> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/18/23 at 10:10am, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/ia64/kernel/setup.c > > between commit: > > 52f40d9a3c11 ("crash_core: change the prototype of function parse_crashkernel()") Thanks a lot for fixing the conflict. I rebased the crash_core refactoring code on linus's tree, so didn't notice ia64 arch has been removed in next tree. > > from the mm tree and commit: > > cf8e8658100d ("arch: Remove Itanium (IA-64) architecture") > > from the asm-generic tree. > > I fixed it up (I removed the file) 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. > > -- > Cheers, > Stephen Rothwell