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 87123C0015E for ; Wed, 9 Aug 2023 07:54:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229628AbjHIHyS (ORCPT ); Wed, 9 Aug 2023 03:54:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjHIHyS (ORCPT ); Wed, 9 Aug 2023 03:54:18 -0400 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC7EA173A; Wed, 9 Aug 2023 00:54:17 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 4985F5C0120; Wed, 9 Aug 2023 03:54:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 09 Aug 2023 03:54:17 -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=1691567657; x=1691654057; bh=52 YpBI7Zd/RbEZj+xJYnJaKHk3vZ1CerWjYIvZGmtqY=; b=Pc87tZQ+Nu3WykEhh7 zKZWWB1BLYPnn/HyTYNqjOfJDtNAEZp/jWPuaJwXUgLZynpeGaVshmRHqYl2PJuL ts1Yg/0cI35LL7RJ95x8Yl6SnBd6q32s8QByuvbvuimNe1idsfx82G553XnZECVO TNDJWwTTMR2K2CJypWp8+eJcqt2YvR3qvT3mUcugiZSYDXLNg7uAueAm5il9bcRw B4RT1OTPc4+/1Zuh9rAlYFEt7AdukTnrAnx4ZMJWjdKII+tjbH9xvt8YZG7oQLlP f2M4yGqciqYM4Cu7YMMa7bt43igqc4ejRru8v0peui3iuCFyCy7y6S4SeTu/c160 H0lg== 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=1691567657; x=1691654057; bh=52YpBI7Zd/RbE Zj+xJYnJaKHk3vZ1CerWjYIvZGmtqY=; b=mek0K1ofVCJuwzfvL5iwpuP2NEz0G tI3EG+AsIkFDFaLqo9PQnNWtYqEgXZsxH3Tbs4PD3Ytsbu9GrnIMG/So3P4egHaB i+xsBvjhw7lnl/oozxuktqNDheN+715AWHGU6U8g+ukMgAld1kL+Kvl0ucc6auCY 2XX0EuHagwUHn8E1B3oBmdAdHDnpET6387JwAQXOSGlKWv9XYyDywzszIs7KSv92 JHFnZAaWJIXP7z+H7xj/Ngr20tzB6eCzG0EF1xV5V7GMiNwy1NVmFlGfu/VGVgJV LOzvHZ5DYtgFL0Y3fEiIWM4/UjDy+1YE+y/h2onTnF2YWeokjU1HozuqA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrleefgdduvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 9 Aug 2023 03:54:16 -0400 (EDT) Date: Wed, 9 Aug 2023 09:54:14 +0200 From: Greg KH To: Stephen Rothwell Cc: David Miller , Jakub Kicinski , Paolo Abeni , Networking , Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tty tree with the net-next tree Message-ID: <2023080901-scabbed-trailside-3996@gregkh> References: <20230809133723.2ebeddd7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230809133723.2ebeddd7@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Aug 09, 2023 at 01:37:23PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got a conflict in: > > arch/powerpc/sysdev/fsl_soc.c > > between commit: > > 62e106c802c5 ("net: fs_enet: Remove stale prototypes from fsl_soc.c") > > from the net-next tree and commit: > > 80a8f487b9ba ("serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c") > > from the tty 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. Fix looks good to me, thanks! greg k-h