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 30720C54EAA for ; Mon, 30 Jan 2023 16:00:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237244AbjA3QAu (ORCPT ); Mon, 30 Jan 2023 11:00:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237600AbjA3QAl (ORCPT ); Mon, 30 Jan 2023 11:00:41 -0500 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B831D199C6; Mon, 30 Jan 2023 08:00:39 -0800 (PST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D05445C0052; Mon, 30 Jan 2023 11:00:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 30 Jan 2023 11:00:38 -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=1675094438; x=1675180838; bh=0EW3uWXnO7 g4p/xwansv2fJ2bLuCH0UQwzuldiNnwpg=; b=AzySeLg/+x8vFzDHxidj02rdWP ebIkvXtBBDRVd7lcu3psSa1Onmq8gc2i3ryz+0pxl8ylbz3HJY6q/Wvrrs8gZHER zyHMxm75ASfmN60DCBnW787mg80ochBcUH2RtlEtQMK1dqBph8ZOaF1gQYAhbKWG kqgKfPb5hqreW79QbnEl7mZjI+X4FRG//HkLqXWjQnpaeqaKkWR+E3/c/mW6mDSz SusxQzxKRhUM0Uj2K0NTuAyyWiR0zoDuM4NxC87fA/V22Z2K6hpRloYdYnj2lM9s vOI83GllbCgiSdC1MMBNbsgoW7lf8MGIgFVJCxa/y5vB27Tu6dhfwnCHtChw== 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=1675094438; x=1675180838; bh=0EW3uWXnO7g4p/xwansv2fJ2bLuC H0UQwzuldiNnwpg=; b=mMNhVq8gou7yjhuo0V9GxJ8F0ABMkXSp0Oo33Pbhc0Y0 e/wDj6g+vo7po/hBs0U77s6d/kPQ9u3gjLjbkuavOHcWFk3UQ2gIgada1/bTzutO xoQ6n3J5uIaQg/pvVJTzTtq3EhHXifDu8muqRWLD2KI1zJR8NnMi/rcCxDjTaiqd o4fQG6TuJ7m5nLCUJv9JTfJ+h6xtnFkKRRQ/I7Kl+KKhGAhd9Gt+HNd6BELOFbAH ZIJAuvbEkxAlFzyJKOzyGUH4vyQruUCruTssIKYfoa+Z8fc5M3zk+tSmRkhHdYGa QO78AUI3nM87+ZkNdY7t8WcEsjEi3f2ZfYuO+qGmdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudefvddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 30 Jan 2023 11:00:37 -0500 (EST) Date: Mon, 30 Jan 2023 17:00:34 +0100 From: Greg KH To: Andy Shevchenko Cc: Stephen Rothwell , David Miller , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the driver-core tree with the net-next tree Message-ID: References: <20230130153229.6cb70418@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: netdev@vger.kernel.org On Mon, Jan 30, 2023 at 02:31:16PM +0200, Andy Shevchenko wrote: > On Mon, Jan 30, 2023 at 03:32:29PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the driver-core tree got a conflict in: > > > > include/linux/acpi.h > > > > between commit: > > > > 1b94ad7ccc21 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs") > > > > from the net-next tree and commit: > > > > 162736b0d71a ("driver core: make struct device_type.uevent() take a const *") > > > > 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. > > Seems correct, thank you! Looks good to me too, thanks! greg k-h