| Message ID | 20240102133011.75a12634@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-13982-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id
tb2csp4237297dyb;
Mon, 1 Jan 2024 18:30:44 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFFR74B0VqFHLvagRjAcOSJlWkiJPX6BXzmTp5gT0oxZTZosBqpZ8+ocXneq2y+oBY4X59w
X-Received: by 2002:a17:90b:30cc:b0:28c:b8cf:e8db with SMTP id
hi12-20020a17090b30cc00b0028cb8cfe8dbmr903147pjb.73.1704162644249;
Mon, 01 Jan 2024 18:30:44 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1704162644; cv=none;
d=google.com; s=arc-20160816;
b=M+Kw4OQ9X9c8UYRqbn/tyj2OeOifmESH4WWl97UBU5jsrUlN5XZP6KYzJJMduSKifB
k/rK7v3bFDADfHR0OiAW3N29NhCjtFt6m0v57K9kRCyEcvQim9G5HZPKIBcC59jaYkgQ
MK+wc14yz3nA8i4uZqKS+hQ/TIyI/ZpNtsT0SEhMyGe+wDpNyIJYB1HYS+Na0ngqw5/P
0YdsqScHtILTT/ln6mr+AoQDOKHZeN5SxQ2Tng/O9SLF5Tat2n2R+nMjXRz0FcTAd3ej
HrbFKFw8Q7vFBWa/DaStQdGhKYPbLjPL2F1PMzTSHV3sjkG5YMhdBmwq+D0gbeZzKOYU
Pj7w==
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=a76C6RoEWABPXTGtBLjJTneSwT7P5KUbRkpixwmdCLM=;
fh=j6yFSC8shDmF2iCbIJXHFtUd0JznsIq2z7Mj5Nji+Pc=;
b=jdBIDXjAKF081+iCaDF0DWnZcCeaLZLmHLcfTtfbWGTFG7u4BvuAQA+HATl8AoHRiR
VqGWFPC9KOPsXX/rrAvngBH4U4HnJG30MpxkzbLmeSbtj9e9lpnE5fRmakXaI2DXuex3
yggz+MHyccW3r1YF6fCu2EipuDVWfgflvks7sTMRTKczw8E0PrPeTF6YWezsVv/PrwsA
HMDlJw88keaIexVficyC9Enqm5ls078j1i9YX0U+NtSPg2ram0rP5fLdTFyPIp1x6oiu
pxecm7TRg7oosNTEWxc8PSJDENxtNJQpEUz+ahIItxCLS8fBqZZBQkCPStcZ8M7ZTpm6
iwDQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WOqzuztt;
spf=pass (google.com: domain of
linux-kernel+bounces-13982-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-13982-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org.
[2604:1380:40f1:3f00::1])
by mx.google.com with ESMTPS id
q7-20020a17090a7a8700b0028bf1c9a696si18971630pjf.168.2024.01.01.18.30.43
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 01 Jan 2024 18:30:44 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-13982-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WOqzuztt;
spf=pass (google.com: domain of
linux-kernel+bounces-13982-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-13982-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 57C13B21206
for <ouuuleilei@gmail.com>; Tue, 2 Jan 2024 02:30:40 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 1341C1366;
Tue, 2 Jan 2024 02:30:23 +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="WOqzuztt"
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 13F2336F;
Tue, 2 Jan 2024 02:30:15 +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=1704162613;
bh=a76C6RoEWABPXTGtBLjJTneSwT7P5KUbRkpixwmdCLM=;
h=Date:From:To:Cc:Subject:From;
b=WOqzuzttrN68CM+Gykw9fgYwEkHrZZ6Dnx2UmYpvUvSwEhEC1y2SM/E4bCVWb0ukG
GMNEvMhzEThOf/M6K8RuMOhQa+Tjag5/dsDjWPQp8OhgQ9YkCAAz0rsjI+Z61jtdjO
SjVTK9WbZ7tGQPU5tQbqsZt1q64FuZwJsUGrNLTCwRKoM173XjMwHrz9XYFWyyHcHH
kkwyG9qf0c8a7oK/HPlqqWncaMwb5PgcpXvn8mrO+qrG+ZTJuXaEALhlaU/a+O4KOR
/GkBXaNvgvuULhqynBmBMCSYJHm81e/vgQgyhzHozo+7xT9WBRDhO7ROaQVcFHANIa
pKBwlumz/9Lkg==
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 4T3xdw2WFGz4wbR;
Tue, 2 Jan 2024 13:30:12 +1100 (AEDT)
Date: Tue, 2 Jan 2024 13:30:11 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>, Mark Gross <markgross@kernel.org>
Cc: "David E. Box" <david.e.box@linux.intel.com>, Ilpo =?utf-8?b?SsOkcnZp?=
=?utf-8?b?bmVu?= <ilpo.jarvinen@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rajvi Jingar <rajvi.jingar@linux.intel.com>, Xi Pardee <xi.pardee@intel.com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Message-ID: <20240102133011.75a12634@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6eVXb0ON+oyQXliDjq_zT2I";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1786944048987852561
X-GMAIL-MSGID: 1786944048987852561
|
| Series |
linux-next: manual merge of the drivers-x86 tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Jan. 2, 2024, 2:30 a.m. UTC
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the drivers-x86 tree got conflicts in:
drivers/platform/x86/intel/pmc/adl.c
drivers/platform/x86/intel/pmc/cnp.c
drivers/platform/x86/intel/pmc/core.h
drivers/platform/x86/intel/pmc/mtl.c
drivers/platform/x86/intel/pmc/tgl.c
between commits:
6f9cc5c1f94d ("platform/x86/intel/pmc: Allow reenabling LTRs")
70681aa0746a ("platform/x86/intel/pmc: Move GBE LTR ignore to suspend callback")
from Linus' tree and commits:
2e35e3aa9f10 ("platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init")
4d621c3f02ba ("platform/x86/intel/pmc: Retrieve LPM information using Intel PMT")
d79c3c82ee82 ("platform/x86/intel/pmc: Move common code to core.c")
935b8211a31a ("platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P")
1d62ada48d41 ("platform/x86/intel/pmc: Add ssram_init flag in PMC discovery in Meteor Lake")
544f7b7f651c ("platform/x86/intel/pmc: Add regmap for Tiger Lake H PCH")
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/intel/pmc/adl.c index 606f7678bcb0,882f2d5d8937..000000000000 --- a/drivers/platform/x86/intel/pmc/adl.c diff --cc drivers/platform/x86/intel/pmc/cnp.c index 98b36651201a,59298f184d0e..000000000000 --- a/drivers/platform/x86/intel/pmc/cnp.c diff --cc drivers/platform/x86/intel/pmc/core.h index b66dacbfb94b,2891d8d04fad..000000000000 --- a/drivers/platform/x86/intel/pmc/core.h diff --cc drivers/platform/x86/intel/pmc/mtl.c index 504e3e273c32,e75431325dda..000000000000 --- a/drivers/platform/x86/intel/pmc/mtl.c diff --cc drivers/platform/x86/intel/pmc/tgl.c index e88d3d00c853,91fd725951e5..000000000000 --- a/drivers/platform/x86/intel/pmc/tgl.c