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 X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D322FC433ED for ; Tue, 6 Apr 2021 09:11:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB6AF613C5 for ; Tue, 6 Apr 2021 09:11:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240715AbhDFJLy (ORCPT ); Tue, 6 Apr 2021 05:11:54 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50659 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236391AbhDFJLx (ORCPT ); Tue, 6 Apr 2021 05:11:53 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9067B5C00B5; Tue, 6 Apr 2021 05:11:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 06 Apr 2021 05:11:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=Y/Z9eywDTay3p822ZHKAODtp0rq MgOyQtFB3z+gQNNs=; b=gzPSN33Tc+1gw4JSpIO9q+c1ZwXOzrYmBDR26mqTqeQ 5NpUBkUzm/MK3TUpu8dfNVvEwgers2xVmnwzT3AS0lWtcrGJHkrW/opVSHiycb/z xi7+FeuPJHB0qQCGsq/hrGDbuj1YsQa8wyuK9BAd78X2yH+wq0H6uSXwYIaPVvP9 uoF30T4DrRXkeL5kNzE9fbClTWOHJVK0W52/5ujw7ZNJhMhtCxYOJ3x8ATamMvac rY8KUyBenOfR3MbH4F2xW4VuXwmyKPiqVk61C+HyyBqq439QozCoPPF/IziAmTZ4 SlwafMqubWuF9WGTJ48RjIT0NZDBeyTWqY23Yh9uWjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Y/Z9ey wDTay3p822ZHKAODtp0rqMgOyQtFB3z+gQNNs=; b=wtmMr3pZkeLYY3cnNT0ejO mIQ9pPl+khKTPPzQOQlpf7ob56ofjJBYvqDPSFW3co+o4iJqFoG50HoFTYDaQRmL crRrPedXgMljYKPYGcsfP4B/dwF3DbIEhZJxQxRGkx+3q4AGsNtVlbd3vSfoCa7y P3880kKetfTfQ+i5AgXBMGHEmCoyN6gc38Ryy9vJSVmpe+nD3zQ/6vNRJQSniRdC 5Bm0qHz847wciE8DWSMxIIZ2DEXIRkR1bCwggQJX9aFki6ujbynDF/tg+bCtauID +Lv5SIO32SRA6R1/IVL3DDkeW0kclp+Mg/lpdRu/kGnDRKJn46Lps2EqbOEkZtrQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejgedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucfkphepkeel rddvtdehrdduvdelrddvgeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (unknown [89.205.129.244]) by mail.messagingengine.com (Postfix) with ESMTPA id 68D6524005C; Tue, 6 Apr 2021 05:11:43 -0400 (EDT) Date: Tue, 6 Apr 2021 11:11:39 +0200 From: Greg KH To: Stephen Rothwell Cc: Rob Herring , Lee Jones , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring , Saravana Kannan Subject: Re: linux-next: manual merge of the driver-core tree with the devicetree tree Message-ID: References: <20210406181945.2ae6fed1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210406181945.2ae6fed1@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/of/property.c > > between commit: > > 3915fed92365 ("of: property: Provide missing member description and remove excess param") > > from the devicetree tree and commit: > > f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint") > > from the driver-core 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. Change looks good to me, thanks! greg k-h