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 E3C88C76196 for ; Tue, 11 Apr 2023 07:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbjDKHdi (ORCPT ); Tue, 11 Apr 2023 03:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbjDKHdg (ORCPT ); Tue, 11 Apr 2023 03:33:36 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F387F1734; Tue, 11 Apr 2023 00:33:35 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9D3F95C00D4; Tue, 11 Apr 2023 03:33:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 11 Apr 2023 03:33:33 -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=1681198413; x=1681284813; bh=X4 vFSoqy0z0ajTuhuTZo3O3BR+PJhFn0c0EBeaLNQMM=; b=RDaptidWqQdgfTCSoX GBVot7dZQRGSl78+taVd1AEGguBkbbax+WgrWH2Uds8O0obI21bwZoTO8ol1hFPM e3bh+aXN/h0X18PtA2GZybFkz4R59IQoJOMCqfbPyJUyrD6OY1ykVNS+otTFa9fM +7F1pt02fKp3+W1A5b3u7W5OTOl/cjtBDMRm9lQYqXe+KsMddyF1yEbrlnqBADoW jbvLPgVUFxCYnV0HzpzxVdBn7bypq202j7BLQpkwa98XZXJrW8jDKcHxdjf3uzWP oy1OQGaQe+Zq6vXR8ITA0Bumj4zYdmoz3gH3+vEvtavlRirXNoOFJ9y0puy8rdcJ cHrQ== 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=1681198413; x=1681284813; bh=X4vFSoqy0z0aj TuhuTZo3O3BR+PJhFn0c0EBeaLNQMM=; b=NQnty+W1btVshIWNUGoVOUcUcvNbx xq1+yRIC2WrsUMg6JgFYdUCiGrm3oVB2MhZQ8jg50KJXk+28JWn4P6TYTGsK2U2S KyjbBQU6IojKgA3YEEDiN208VdpV2YGSdGr81THW0oDa+FIwt0cz/fMUryz29yXp /OdvcL98ihnbuE/qc0Kki0E+GEvjj74Kv/sipxc8vYbI9dN8AxDKPFKQF13M9ogx +txITUCYpfGzKZpYubkF4N0lem7z5F7+RFsIGTOCGNgYPtJVF/XvgkW5l7pNbkMi TX/nsXpxu+L9bgTytCziMldIfJ/YTNOtltyeVSTw3CZvrmH+3bOTT3MCw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdekfedguddvfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgv ghcumffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeehge dvvedvleejuefgtdduudfhkeeltdeihfevjeekjeeuhfdtueefhffgheekteenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhroh grhhdrtghomh X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 11 Apr 2023 03:33:32 -0400 (EDT) Date: Tue, 11 Apr 2023 09:33:30 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Rob Herring , Linux Kernel Mailing List , Linux Next Mailing List , Miquel Raynal , Rob Herring , Srinivas Kandagatla Subject: Re: linux-next: manual merge of the char-misc tree with the devicetree tree Message-ID: <2023041121-hazily-dedicator-f7b4@gregkh> References: <20230411135728.07539d81@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230411135728.07539d81@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Apr 11, 2023 at 01:57:28PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/of/Makefile > > between commit: > > bac06718990c ("of: Move CPU node related functions to their own file") > > from the devicetree tree and commit: > > bd7a7ed774af ("of: Move of_modalias() to module.c") > > from the char-misc 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/of/Makefile > index 10f704592561,ae9923fd2940..000000000000 > --- a/drivers/of/Makefile > +++ b/drivers/of/Makefile > @@@ -1,5 -1,5 +1,5 @@@ > # SPDX-License-Identifier: GPL-2.0 > - obj-y = base.o cpu.o device.o platform.o property.o > -obj-y = base.o device.o module.o platform.o property.o > ++obj-y = base.o cpu.o device.o module.o platform.o property.o > obj-$(CONFIG_OF_KOBJ) += kobj.o > obj-$(CONFIG_OF_DYNAMIC) += dynamic.o > obj-$(CONFIG_OF_FLATTREE) += fdt.o Merge looks good to me, thanks! greg k-h