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 8B3CEC61DA4 for ; Mon, 30 Jan 2023 12:31:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236873AbjA3Mbe (ORCPT ); Mon, 30 Jan 2023 07:31:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236854AbjA3Mb2 (ORCPT ); Mon, 30 Jan 2023 07:31:28 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8368C367DA; Mon, 30 Jan 2023 04:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675081887; x=1706617887; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=Us4t9RfFIA7QDDFmTvE79SoNQbhU2WQe72gtsd+ApzY=; b=dyChAvkIXOiUF12arWmG1yEJFd2ihEPZMLleSPUGPY3HGnxvr5ELrzMP RRHOT+tZTJG/buGW3Xc8lZvkZoJcnd46WS/YluJlEOXw5HXLfZA16HRl8 zEnkSP9QTP5WTrxpmJiUI0cbR9FQbGRT7FgqKzeYux+IGd73dVb0xumrd yAzSpml9X68gjR714qWRs5XOSlrjO31MCcQk1w2zscctCGmZ+n4TY8O+U cwGaF58OGEVuTOa6SDUgMVualuSpsBpYL5OvaEQsKR8eqihoLjqPMJ9kO xBuzWw1vEmQphx5xQUhxholexU83OgMbK+/KG9LdlLoq/mfRZQojWHl1Q A==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="327562232" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="327562232" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 04:31:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="696379714" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="696379714" Received: from smile.fi.intel.com ([10.237.72.54]) by orsmga001.jf.intel.com with ESMTP; 30 Jan 2023 04:31:18 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1pMTJc-00HLVK-33; Mon, 30 Jan 2023 14:31:16 +0200 Date: Mon, 30 Jan 2023 14:31:16 +0200 From: Andy Shevchenko To: Stephen Rothwell Cc: Greg KH , David Miller , Networking , Greg Kroah-Hartman , 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: <20230130153229.6cb70418@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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! -- With Best Regards, Andy Shevchenko