From patchwork Tue Jan 2 03:49:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 184210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4256628dyb; Mon, 1 Jan 2024 19:49:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEzWcaPMYvpzQbPgjAzLrNs7I7cm5gCCm8JSY8e725LB8hmOWmoE0BNaGkdsRBugMCtl0z7 X-Received: by 2002:a17:90a:ab06:b0:28c:c5fd:32eb with SMTP id m6-20020a17090aab0600b0028cc5fd32ebmr4058465pjq.45.1704167399080; Mon, 01 Jan 2024 19:49:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704167399; cv=none; d=google.com; s=arc-20160816; b=byo7aXFyzNdcdIKv251WX2vFNQf5w0QY3gNQ+lBu3WTgGJfW961K5lmuo1YrQK8ng6 aLXD03Oc3mjvX3Gjf466hsaelYZWGrgv3WsB442k4rsoi87G3bw8KqZKDGfNR3/IdJhL DuioZpcjjPw06k0bx+yJ6XKn0D9xUP6Un7OxmTD8DXS8I3LAcicl67Yroz2jBRkhaMfp xoHxauS+CZIS2KbFQ6T8zobvozeABRGa9WpnQRwUftWQa1BAOoRDR4pAbdheJi3uypdk 98CU5HsEnwBBN7DiU0EEiUBED3gMvOk76kHgi0YaD3/zzdD6aVGB8RRAik9XsEWieQFA wQzQ== ARC-Message-Signature: i=1; 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=fHH2oL5nwatjdyOgNtoiTqFaYGBo4OoqMQjSZLVF+N8=; fh=aV5sOG4N1A3FmyVfOezwuk0oCPGFV8V8Tkng7cy1vGo=; b=WT3sMvz/OI0LQCIu5/2cvKYPsnBCrAkwMOTzLND3hGR5wKRC14XtLqsdOVBwRuqw1m UAMzLzrOHjBOk8tzD/HPBrOZXCpETtaNUoe9EHCNAl605VBhRcVTmDMs00lz7zbKkqaF NGIfUf/A7tNmu8rYpCY2ujpsxXVDUUkpeDbP+oedNfSXtF1MLk5y0Yk6FPOL0CfZtow/ L73Z2HdUyz0vniCewlG7ntq5RUykTvKJYfkOgaflXEQFZSuTKaWdiuv106aFdPgA37II wluNBF3JLqjH5h5LL29SVVD9008IOHmXEaRREt4OKDKmYqFfg+QP2E8zXdDjU2Nasvuf VL5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MSH5f8Dt; spf=pass (google.com: domain of linux-kernel+bounces-14003-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h5-20020a17090aa88500b0028b88f8669fsi19415966pjq.24.2024.01.01.19.49.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 19:49:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14003-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MSH5f8Dt; spf=pass (google.com: domain of linux-kernel+bounces-14003-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14003-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 3A369282133 for ; Tue, 2 Jan 2024 03:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 611171398; Tue, 2 Jan 2024 03:49:40 +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="MSH5f8Dt" X-Original-To: linux-kernel@vger.kernel.org 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 55F00EBF; Tue, 2 Jan 2024 03:49:28 +0000 (UTC) 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=1704167367; bh=fHH2oL5nwatjdyOgNtoiTqFaYGBo4OoqMQjSZLVF+N8=; h=Date:From:To:Cc:Subject:From; b=MSH5f8DtAwJHOoRk1DPqduTTJeF/Xi4jsKsBhsoW/i3fEs/aBNKK6AVpeWxcc+iKV I2UIs0/oSe5yE18b722exYGgudFhIYW8TDtQKFftE8Dn81d4MRphXKNHekMZyUlKUv hSqiun8yL48o18f0r+NUlHaRN/zhKZMDRmdnL3qmZCyI1Ub8m6LZR+ljVH8zqPHKQn jIopWmPOwBOTkJEZWj9vZRrHziA5dhs7De3oMxOSnlYOf2BzGBOrFa4cH0SQ4BAU7A FMzXrd7rg7r0Y7FI8vqoGaXWhFdv2x000cS9wZjbM22IOZL+RbhG5+UW4JFq0RNAZb FyMdXwfhfxtOw== 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 4T3zPL2C8kz4wxX; Tue, 2 Jan 2024 14:49:26 +1100 (AEDT) Date: Tue, 2 Jan 2024 14:49:24 +1100 From: Stephen Rothwell To: Dan Williams , "Rafael J. Wysocki" Cc: Dave Jiang , Linux Kernel Mailing List , Linux Next Mailing List , "Rafael J. Wysocki" Subject: linux-next: manual merge of the cxl tree with the pm tree Message-ID: <20240102144924.1fdfa044@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: 1786949034936129230 X-GMAIL-MSGID: 1786949034936129230 Hi all, Today's linux-next merge of the cxl tree got a conflict in: include/linux/acpi.h between commit: f47507988145 ("thermal: ACPI: Move the ACPI thermal library to drivers/acpi/") from the pm tree and commit: ca53543d8e34 ("acpi: numa: Add helper function to retrieve the performance attributes") from the cxl tree. Dan, thanks for the heads up. 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 include/linux/acpi.h index 118a18b7ff84,8b0761c682f9..000000000000 --- a/include/linux/acpi.h