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 102B2C433EF for ; Mon, 28 Feb 2022 21:26:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230328AbiB1V1L (ORCPT ); Mon, 28 Feb 2022 16:27:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230312AbiB1V1I (ORCPT ); Mon, 28 Feb 2022 16:27:08 -0500 Received: from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com [66.111.4.229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE9BF122201; Mon, 28 Feb 2022 13:26:28 -0800 (PST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 4F59A58022C; Mon, 28 Feb 2022 16:26:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 28 Feb 2022 16:26:26 -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=OIyz6P+AJkzgHPB6lyoqYyA4WryI17czGefy6S o4+vg=; b=g+0sLbddNqSKpmzpc8dRTL56R47UoWQdA/cTdlH2s7qDz1LunFgBrx 77D5SFRQOoavhceKTiA5eGeaGrNFb68RGBbUBpv3y7sFXzmSLwpKeRiYcVv+0tJE Ou5JpSjSFnkFHo3IMJzOxgnRwmvi/l2LbR9lozfhKjvwXpJ6X7au/VKHTrffLnj5 Y/X6G9Wyo/od7aYAHChfzL6AZiBm4vBBPNypxXERnrj6G5bGNUrx7/Efa1NTkDYa SbamfILq3vDTdlmAg0qpLWqfQps2qYvvQU0MKrO9KzHsS2XDNAWcg+7aY5vWGIJ5 IJxf5Vg982y/c1D7B6E4Y3rKTuMS2SzA== 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=OIyz6P+AJkzgHPB6l yoqYyA4WryI17czGefy6So4+vg=; b=MvmSfJvCfoV9oQrUkCqSJe2LBYIWbqQAL sGsAh5QeJHl0JMOHyqMcISU5a1i0jq18mxziuS0pg+xlxwgPU88f3LCb2rge64Gw mME+sG3YZp1mKR/Qx0AScN//1iA3mi6KWykeaX9VLFlI4l18LT7oahoz4FP8F71h MP4TwMgMzZvebJDuO33S8Aa6p2vLW7GA3QTgymdP+D72qbMIxztPEzfFkewya/t8 lPQQzIToMmSKcgU62jL/nHKl43o8xXTYpB3kYp/TrzaybDOC59Kl2xXNl+KGhLtk IWyEs1y2x9BuQkNGM0MiJOgP6GApDg8CWR1337VcV/B5TGLep0OJQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddttddgudegkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuhe ejgfffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Feb 2022 16:26:25 -0500 (EST) Date: Mon, 28 Feb 2022 22:26:22 +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-kernel@vger.kernel.org On Mon, Feb 28, 2022 at 12:46:44PM +0000, Lee Jones wrote: > On Mon, 28 Feb 2022, Greg KH wrote: > > > 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? > > I did try to catch it before a revert would have been required. My fault. > But yes, please revert it. Will go do so now. > The Ack is not standard and should not be merged. I do not understand this, what went wrong here? thanks, greg k-h