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 DBA6AC433EF for ; Mon, 28 Feb 2022 10:46:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232459AbiB1Kqw (ORCPT ); Mon, 28 Feb 2022 05:46:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbiB1Kqw (ORCPT ); Mon, 28 Feb 2022 05:46:52 -0500 Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C8D657B3E; Mon, 28 Feb 2022 02:46:13 -0800 (PST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 95D2358025B; Mon, 28 Feb 2022 05:46:10 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 28 Feb 2022 05:46:10 -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; bh=feVj5PTVg+Alvboej1oYXFjSRH9S+YW1b1Xb8Q QaQPc=; b=bGJWYiJv7fV9kVLNaDdOg1JT9KrAiyOBxvzIfjNWGrjV6P8pGmyE8m ZjVmWnmhkZVJ2HL06VIDY7V+b4AoD82hSYUZ9Aw4AM3tECWCNl8fxeqEjHWBEIq0 EY8Th4aGQzuDesHVw/XBA0k1qZCxu0WRwYqjzvwtwOJwBeFzDwjM68iGybNyZFmr kR0BREZFG/9qBY++9iszRhCPZBATvxEzC050vbSHEkOvGYd8kN9ubYkgjIb2XFGw xOO5SNrxdRjX5kX2+gLzttkQez1KhsmcoaJCJBi0qNuj4uQs10DflbO0Cefbhg/j g9BOmKa2Fc3rGZ9SKN5OAPFV5sH6kwxg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.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:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=feVj5PTVg+Alvboej 1oYXFjSRH9S+YW1b1Xb8QQaQPc=; b=c7KElXrnqnPUfuHZk64XXpktPPkEGrC0/ 6f2+7c6K23R/v+b6FukYLKm4OoNrJGJd/l0+vPw4+Kf1qLsJDzNjqbp/F4/7amgs T3/WbLT1GrMHSM1ubtg5ESJ46BBIUOKZ+zWPYwfKqRNJQbBCbousNS9951X7zEf/ sFKylsL9zAi03YS/yvwWx7addRQHQgSd6j2chRSFh3R+9m9rJLY+JFXAi4LrjgkQ AESGGwkIPmkgIKqOcEBINN9H7HAEKA0l7g59+YcNg2ga4E5+BhXL4qwBTKzfpZYD 3ZrNFrNCFD7qC/pfnIa4dgqe6Mux1/b4Z3C8eHHYfGN977ig9A8Mg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddttddgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Feb 2022 05:46:09 -0500 (EST) Date: Mon, 28 Feb 2022 11:46:07 +0100 From: Greg KH To: Lee Jones Cc: Stephen Rothwell , Arnd Bergmann , Alistair Francis , Linux Kernel Mailing List , Linux Next Mailing List , Robert Marko Subject: Re: linux-next: manual merge of the char-misc tree with the mfd tree Message-ID: References: <20220228193928.3ec6ee98@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Feb 28, 2022 at 09:01:49AM +0000, Lee Jones wrote: > On Mon, 28 Feb 2022, Stephen Rothwell wrote: > > > Hi all, > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > I did ask for this *not* to be merged when it was in -testing. Sorry, I missed that, I saw your ack on the patch so that's why I took it. > I'll follow-up with Greg. Should I revert this from my tree? thanks, greg k-h