From patchwork Thu Feb 8 01:57:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 198159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2629380dyb; Wed, 7 Feb 2024 17:58:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrdYyVa2DlGgrroYkVX8YJEOa4c6A6u5tjt3sceCZPKHMpe1/iAYbiXF4CApBeR0M4E4vD X-Received: by 2002:a05:6870:d8cf:b0:219:3e9e:f69b with SMTP id of15-20020a056870d8cf00b002193e9ef69bmr8366247oac.37.1707357492423; Wed, 07 Feb 2024 17:58:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707357492; cv=pass; d=google.com; s=arc-20160816; b=lvPg+ry21JbDu5OwrUA0OO2GqrW+v6tE7klakapmnXNR6vqVXD3QOf7UhrmOkg+6cp NnpzJIRlCvhaoPy3Kjcja0kqdFmyPpK+Uivef2isW37C4VQPCLsiLd4Qn6SvsJ/73rsy N6pzWYK5M7/LSkFxTljwQopV+iuVmhQA35P9qCO9XO4VZELv4cbvZcOsEw9ePAG0its3 Qma5eutRWYdx62e/s67YOgOr1pz5wGxEe58A+IfJgUosh9W3iA5G9DDo6dxkoE5gd/y5 AN7mkdExfblGq4BVGoDD/aTdBbZnpg4CVuD2S5biIZyvjpiDLm7z5lq+9y/u03ekYby0 odrQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=DW86THaytXEkTAbOBp6R/wY2SA3+Rg1m/cQoA7QROL0=; fh=MF/QghlNiUzwvoD9lbKckC8f6xKtfn5GXVS+gO8YWpU=; b=fZMK2tgTNdwZRaCw/TFmvmq+atIqkgOflIABhFZZub5ImRRrcny4O9uCLtPfojux/R SIhkAUNoY78BBc0zZtO7gIAb4Obm9LMzPSzZGVR+1ICrb6kLZjotav2iYrs3H6rE3o5f Yc1ebKw+MhRTc9sjWCs1l+KQ2W1OvIpFmAiNLf+YqqRgpvxJUwXIZgNCgRNfuh5wl2RZ 5uSkUWS2txAiqihJ3aHmgyrW+yVDor6xI0QxOWNwpVrKpzbXPMe5w6hWVnkMs5gTBq8/ mZtWX+KHQrpYsGgpiQo2giafHegAvH7QHFVvq7uZpiyxmlJbCqe8OGvrdxE8VE4pqRiK OtYA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KorkT4J2; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-57380-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57380-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCXuLFyTjkvmGFSVH67J9FKLJAUD5ulr4vjtlSKHABaoAgq/1qrjs2eNHluaheowvGDxRNF1lCJArX1vXYpuY4qVajCIZg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 191-20020a6300c8000000b005d8b6a84416si2636004pga.534.2024.02.07.17.58.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 17:58:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-57380-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KorkT4J2; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-57380-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57380-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2F9712871BB for ; Thu, 8 Feb 2024 01:58:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F40DC20312; Thu, 8 Feb 2024 01:57:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="KorkT4J2" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 922E51E496; Thu, 8 Feb 2024 01:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707357472; cv=none; b=Mqyj2lYKSwOPYV3GaJGNiAG51XPA0QduHxqr8FJvkgTjqIoaWSaFKPZV/YaqW4udUPjDd4HX5BVoWHF16l+q/CZF2x6Naj0hhoax+KC+J4LyWOPtD2MgLf8dAU7o41IWUgttQS7qTeLVPD1eFuuc+q46nEE5YyX7jqc8VVuEVMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707357472; c=relaxed/simple; bh=bbYzQgidFTlMKAPLlA7znSNn2HIs3NcXLeDAyP10gdk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=sHJHETNB1oLZm9iOGgFZ5/Tnl1xdplCnnvmuxy7/T2UaoFMZpiMM0pxV8w+OU4k9DFSRgSnDvBJi147849Qz4V12Phh7yI/YTP1nd3F+O52N9ba1hxYUuL9RSXAmeX2DBO8xswiXhUdJnvotSEcYMBTxehUzdBQGE84KfYVZM7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=KorkT4J2; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707357467; bh=DW86THaytXEkTAbOBp6R/wY2SA3+Rg1m/cQoA7QROL0=; h=Date:From:To:Cc:Subject:From; b=KorkT4J2xayLgb40Puz0q3GxVOZsFMFJYZA5fCJqQKf1EZqJgJayULqnp0LlEHwxj tgB8wH5vwSL+IVpfqbPeTRDXI/XArElinh0azfCSi1zdbIJiJ66mic0ulKOoObUCW6 BATFCxHR0HcrXuOD/j0V0nfroPQuUNz88uXGQk8DiWKq7ZpGiGuDB5vfcU8l1hLlIr 4wprpLqz715d385LexTFbbtQoHP0jystNzLFH0HD639QugUQKwttsBhFJcNZTWo/f8 ZUukwrSKo2B1dnAR1afQEBxrqkyJLxCtpkGX3yJ9+Wvl0fO43/s/U8iEo8OwujUaRV f8RyWyu0RBNVA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TVg9Q0S3Wz4wcR; Thu, 8 Feb 2024 12:57:46 +1100 (AEDT) Date: Thu, 8 Feb 2024 12:57:44 +1100 From: Stephen Rothwell To: Hans de Goede , Mark Gross Cc: "Ricardo B. Marliere" , Armin Wolf , Ilpo =?utf-8?b?SsOkcnZpbmVu?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree Message-ID: <20240208125744.300635a2@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790294090236190868 X-GMAIL-MSGID: 1790294090236190868 Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/platform/x86/wmi.c between commit: 3ea7f59af8ff ("platform/x86: wmi: Decouple legacy WMI notify handlers from wmi_block_list") from Linus' tree and commit: 10fdfd13a359 ("platform: x86: wmi: make wmi_bus_type const") from the drivers-x86 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. diff --cc drivers/platform/x86/wmi.c index 3c288e8f404b,5682c7de0394..000000000000 --- a/drivers/platform/x86/wmi.c