From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Darren Hart <dvhart@infradead•org>,
Andy Shevchenko <andy.shevchenko@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Peter Zijlstra <peterz@infradead•org>,
Ingo Molnar <mingo@kernel•org>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Mon, 29 Oct 2018 14:29:07 +1100 [thread overview]
Message-ID: <20181029142907.54af8715@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/intel_telemetry_debugfs.c
between commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from Linus' tree and commit:
1a7938a632ce ("platform/x86: intel_telemetry: Get rid of custom macro")
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/platform/x86/intel_telemetry_debugfs.c
index cee08f236292,30988e31c713..000000000000
--- a/drivers/platform/x86/intel_telemetry_debugfs.c
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c
@@@ -319,8 -308,8 +308,8 @@@ static struct telemetry_debugfs_conf te
};
static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
- TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf),
- TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf),
+ INTEL_CPU_FAM6(ATOM_GOLDMONT, telem_apl_debugfs_conf),
- INTEL_CPU_FAM6(ATOM_GEMINI_LAKE, telem_apl_debugfs_conf),
++ INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf),
{}
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-10-29 3:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-29 3:29 Stephen Rothwell [this message]
2018-10-29 9:34 ` linux-next: manual merge of the drivers-x86 tree with Linus' tree Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 6:24 Stephen Rothwell
2025-01-14 3:32 Stephen Rothwell
2025-01-14 3:42 ` Kurt Borja
2024-08-26 3:44 Stephen Rothwell
2024-03-08 2:34 Stephen Rothwell
2024-03-08 2:19 Stephen Rothwell
2024-03-01 3:14 Stephen Rothwell
2024-02-08 1:57 Stephen Rothwell
2024-01-02 2:30 Stephen Rothwell
2016-01-15 1:56 Stephen Rothwell
2015-06-02 6:07 Stephen Rothwell
2015-06-03 3:27 ` Darren Hart
2015-06-03 4:04 ` Stephen Rothwell
2012-05-31 2:06 Stephen Rothwell
2011-04-08 5:26 Stephen Rothwell
2011-03-24 2:48 Stephen Rothwell
2011-03-24 2:52 ` Matthew Garrett
2010-08-25 1:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181029142907.54af8715@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andy.shevchenko@gmail$(echo .)com \
--cc=dvhart@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox