From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout2-smtp.messagingengine.com (fout2-smtp.messagingengine.com [103.168.172.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0055D10A09; Fri, 19 Apr 2024 06:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713506970; cv=none; b=cVUg5puc/YaYn12Z9j4MNWPtw+AQjmRlXPP6K8rdYQRKx3+wQozA5N82v/BCcFUDswB3BkuZ61lQJWT8btG5Ep+zLotZbqifBOzZQhHyeSeIsbuBCy9fXRXUm2XRsBQlQXfQhzHgolUZSpzk5nQkkk5vOJGkQOd7A81K93ZazSM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713506970; c=relaxed/simple; bh=RyIwE3trWPlOq9sty8gBXujeKIe368HFR8WPMyM4z9g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=tlwOQNLWKfFMPZKKUV1l4r7/eE1I6xjfBPfZB5uMwU56HUmucGw925uhdGfeKZtEIx9Yg8UMXTNLoK5Wz7Xv12NqlQp0D5mtHDrEn8c8/l1xo1F5GeagMhS2DX7i8NyrJ4VvX/6E5oSsa9AhylcFq3DCDuo48eCcadMRYyhSJdE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kroah.com; spf=pass smtp.mailfrom=kroah.com; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b=EFGa45E9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=EO2W39Hy; arc=none smtp.client-ip=103.168.172.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kroah.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kroah.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="EFGa45E9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="EO2W39Hy" Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id C56AB13800E8; Fri, 19 Apr 2024 02:09:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 19 Apr 2024 02:09:27 -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:subject :subject:to:to; s=fm3; t=1713506967; x=1713593367; bh=TBixqiZ31b LNMEUE6H16ebkmGgcqoeb9yiDBFLDTjv4=; b=EFGa45E9cUNzbNkm28/ZJjOd+R nkC91IJiDybbjMiDLxfCgogjmwsb27L2jSQK38AzcGudpA59MKBBZYe3aU2Kkaf9 4fd6phaO3Lcrs/K0g5C1lywJjq964wxj7BpJpclw62o7ve4tANFYSxZdDrrV9Dch 9zgtiIvspaLZG/LdsuYGzSWai//L2smXeP7u8gsfaRuRfzyvLEMKhGPrtFoSqjvf 6qzY/qTrUTX3+8rAapG3jNFweN3cwAeBhiXAaikQoWS2ivIA4vs3m7aG5cJxL2oO PKr6SzWgNK3LaRAudl8xqvdQ3ryVpFfcYvowSAaWtcQI9tZR4Dmn7qYl91JQ== 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:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1713506967; x=1713593367; bh=TBixqiZ31bLNMEUE6H16ebkmGgcq oeb9yiDBFLDTjv4=; b=EO2W39HyVEBr0yJQdp4gh2cU6flE8tH7pl5ciMmOjuac lWXzozfN40QvCkuN3lnuUOrjQbMslsPTgxi3/VQpTVyhZ6kqk13ByxO/sM4qOmbe CyE47IHIWhnJUZpR6AVDurHulCI5eVSCEoP5LPjVjL02jFWqrCKohEYCdzR9Fp4m 6Y8VHOCszJtHDAXYnr8tROQAlfof0T32vj+VH+oRtQYIPk8qdGdDI36pghIqNvY2 2cGlDclYZdvU/4xaDvcEwbGZEYd8Q6eNv5CNTg1lfn5ZOYFA/tWFrfsbYzLvep76 p+nL97WCl9H8XMUQCvMxtZfKvFcmMBMPmzKPkDsCVg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudekuddgleeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 19 Apr 2024 02:09:26 -0400 (EDT) Date: Fri, 19 Apr 2024 08:09:24 +0200 From: Greg KH To: Stephen Rothwell Cc: Andy Shevchenko , "Jiri Slaby (SUSE)" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree Message-ID: <2024041916-grove-cymbal-291e@gregkh> References: <20240419141947.4bc16fa4@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240419141947.4bc16fa4@canb.auug.org.au> On Fri, Apr 19, 2024 at 02:19:47PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got a conflict in: > > drivers/tty/serial/serial_core.c > > between commit: > > 9cf7ea2eeb74 ("serial: core: Clearing the circular buffer before NULLifying it") > > from the tty.current tree and commits: > > 1788cf6a91d9 ("tty: serial: switch from circ_buf to kfifo") > abcd8632f26b ("serial: core: Extract uart_alloc_xmit_buf() and uart_free_xmit_buf()") > > 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. Looks good, thanks! greg k-h