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 5C2FDC54EAA for ; Fri, 27 Jan 2023 07:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232056AbjA0HDN (ORCPT ); Fri, 27 Jan 2023 02:03:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbjA0HDD (ORCPT ); Fri, 27 Jan 2023 02:03:03 -0500 Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F0C5279AC; Thu, 26 Jan 2023 23:02:57 -0800 (PST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9587F3200917; Fri, 27 Jan 2023 02:02:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 27 Jan 2023 02:02:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc: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=1674802973; x=1674889373; bh=W/jkW9u0WB 5SFsXC/R5d1e2tDBzid48tPP/Q1cQjf9k=; b=G152YWx970G3IBAq1Ci1dNb8wI BvnaCy+ZczprTeaX+ojbTBTBrgGejn8v46HorxFilBNQLovCQ4e8srbm2agfvetm g2pwqmG4o6bKSCcs726Vv1BXeBJrP15n5797pYRTQGP6ZgBQ0pxnA/o2fQKs5CtO Nglg5yTuWJ4gQooywVFW8qNCm6TNSc0KK6FNqLleObups3MC6B/YXgXG/uFg01lU 17nlGfFHCKJoePVvkmjJmJSpQFE8/sSwreWj85CPdh5Db6BGps7vgRDoQFTk5KH3 C65+rBtqyEtmuxgFvXo9gR3WDjC3LP1PB3GgPZXNk7jH6HJMTu6HgLmcrBtA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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=1674802973; x=1674889373; bh=W/jkW9u0WB5SFsXC/R5d1e2tDBzi d48tPP/Q1cQjf9k=; b=nlEDtlFBOEUWzp+LVIyBqpVHU8mMfBboPgvn0GFRxKao LiBvtyeXGKI0c5IeP8hoqtriY74wrZo/H+m4e+un+0kiRcMwZ3cfVoKeLH3tsck0 vbv185cLjpIVrs/E5PMxtwQD+Z02VQsih/cqBI2xEeF/DR4ymGYtxnmkN9feLKYi YdO35j4qNtCC8PPvbhEUJU/OgIzB6PioXdShDYQmFxJn9GAgSzxLKWI+lfHfpiOT LNm4KiBhQbuvHJHqRu7w00wAoM9+d05KgX0QsKcgn3ZRSKCczv0ydCUzIHnnixIC wsHY5zZRieitv3j+umnQAMGpw/a5GhGt9HQefUl4JQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddvhedguddthecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgv ghcumffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeehge dvvedvleejuefgtdduudfhkeeltdeihfevjeekjeeuhfdtueefhffgheekteenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhroh grhhdrtghomh X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 27 Jan 2023 02:02:52 -0500 (EST) Date: Fri, 27 Jan 2023 08:02:48 +0100 From: Greg KH To: Stephen Rothwell Cc: Kees Cook , "Jiri Slaby (SUSE)" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kspp tree with the tty tree Message-ID: References: <20230127155753.1f9b9517@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230127155753.1f9b9517@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Jan 27, 2023 at 03:57:53PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > drivers/tty/vt/vt.c > > between commit: > > feb36abbedea ("tty: vt: remove struct uni_screen") > > from the tty tree and commit: > > 19c30ead3938 ("vt: Replace 0-length array with flexible array") > > from the kspp tree. Kees, I was waiting for a new version of your 0-length patch before applying it as I thought there were review comments on it. So you should probably drop it from your tree or resend it so I can merge it into the tty tree if it's acceptable. thanks, greg k-h