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 22E9DC001E0 for ; Mon, 23 Oct 2023 07:28:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233482AbjJWH2I (ORCPT ); Mon, 23 Oct 2023 03:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233461AbjJWH2H (ORCPT ); Mon, 23 Oct 2023 03:28:07 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6644E9B; Mon, 23 Oct 2023 00:28:05 -0700 (PDT) Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 106CA320097D; Mon, 23 Oct 2023 03:28:03 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 23 Oct 2023 03:28:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1698046083; x=1698132483; bh=4t S7wTIq5gjgJ7VQWrm4xGur6XyZli0T1vZpPDfxzU0=; b=rWf2mi0ctnXq2hl1Bf yrWwM635rkhMiAy1dbtIbXoDzINs1NIAa5++dn6RE9ekNd7Rgu5FNIUe+tkwu9Qw mfoofsk8hi5yHtfIttT6qmCbUnaOCCm25cwsBGQPRdnYNlx/4mlsT24CNjESrIG+ +m27oEIvfacIq/ILTw4GHgzcKNgnNY2yTApgxA97Swg9kmWN/mCDUW8ozJOVwtOX 6ird5Sg13/yaEGIL58xG0242mNDFwnkKXYtSWFuAGYfBFsuCk1vLpghf6iTVNFmU kwr8QL4G9YY3dWee98Mw3BzMzGm54+hVAvr8LfRPck9wZ7TxhNOQqmje3EEFLevD sAbA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1698046083; x=1698132483; bh=4tS7wTIq5gjgJ 7VQWrm4xGur6XyZli0T1vZpPDfxzU0=; b=M3epvxCdg7yjWjnU7hZX7ffMBEl6O KWtABwQ1shCOlEFp0I8iXhtyR+4NQl6I1I8yWAbxbAIPCOh/O6H/BHgK+tT5auV6 CvenYXIHGV1Bpc7rHrN91A0tZYYK5BY5nSI5aLvooq5lP4D0dk1vWKW5kIWBaWKG anXBCUDrTFob2WA/KEz2yQxqKAsQBb7HOb4E1YQ1HNp8S9vcCqDcaBc+6hJkY7Hw zaXmpnvOYbxR3vCQW68oeHaYAWNWSj/s6a9t0qETeqW3zz+iQ/NXKjtq7QI1tavY s5ma56G8KdE9ZNvN1N0zr2SXUwXfe6vXr+ndnvkxZmzqi2SpdSxUzLjTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrkeehgddutdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 Oct 2023 03:28:02 -0400 (EDT) Date: Mon, 23 Oct 2023 09:28:01 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Ard Biesheuvel , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tty tree with the asm-generic tree Message-ID: <2023102350-gumminess-crease-db03@gregkh> References: <20231023144327.7d18a847@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231023144327.7d18a847@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Oct 23, 2023 at 02:43:27PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got conflicts in: > > arch/ia64/kernel/setup.c > drivers/firmware/pcdp.c > > between commit: > > cf8e8658100d ("arch: Remove Itanium (IA-64) architecture") > > from the asm-generic tree and commits: > > 8a736ddfc861 ("vgacon: rework screen_info #ifdef checks") > acfc78823326 ("vgacon: remove screen_info dependency") > 555624c0d10b ("vgacon: clean up global screen_info instances") > > from the tty tree. > > I fixed it up (I deleted the files) 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. Deleting the files are fine, thanks! greg k-h