From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
linux-next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the pm tree
Date: Mon, 8 Oct 2018 13:34:51 +0300 [thread overview]
Message-ID: <CAHp75Vf7EEpv-oukQCAver==yd28CCYx4aChCaBvg23E1F-YKQ@mail.gmail.com> (raw)
In-Reply-To: <4344904.ysa79Efigr@aspire.rjw.lan>
On Mon, Oct 8, 2018 at 1:11 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> On Monday, October 8, 2018 4:44:49 AM CEST Stephen Rothwell wrote:
> >
> > --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > drivers/powercap/intel_rapl.c
> >
> > between commit:
> >
> > 17ed15183c24 ("powercap: RAPL: Get rid of custom RAPL_CPU() macro")
> >
> > from the pm tree and commit:
> >
> > f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
> >
> > from the tip 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.
> >
> > --=20
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc drivers/powercap/intel_rapl.c
> > index bb92874b1175,8cbfcce57a06..000000000000
> > --- a/drivers/powercap/intel_rapl.c
> > +++ b/drivers/powercap/intel_rapl.c
> > @@@ -1133,40 -1133,47 +1133,40 @@@ static const struct rapl_defaults rapl_
> > .compute_time_window =3D rapl_compute_time_window_atom,
> > };
> > =20
> > -#define RAPL_CPU(_model, _ops) { \
> > - .vendor =3D X86_VENDOR_INTEL, \
> > - .family =3D 6, \
> > - .model =3D _model, \
> > - .driver_data =3D (kernel_ulong_t)&_ops, \
> > - }
> > -
> > static const struct x86_cpu_id rapl_ids[] __initconst =3D {
> > - RAPL_CPU(INTEL_FAM6_SANDYBRIDGE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_SANDYBRIDGE_X, rapl_defaults_core),
> > -
> > - RAPL_CPU(INTEL_FAM6_IVYBRIDGE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_IVYBRIDGE_X, rapl_defaults_core),
> > -
> > - RAPL_CPU(INTEL_FAM6_HASWELL_CORE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_HASWELL_ULT, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_HASWELL_GT3E, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_HASWELL_X, rapl_defaults_hsw_server),
> > -
> > - RAPL_CPU(INTEL_FAM6_BROADWELL_CORE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_BROADWELL_GT3E, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_BROADWELL_XEON_D, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_BROADWELL_X, rapl_defaults_hsw_server),
> > -
> > - RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_SKYLAKE_MOBILE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_SKYLAKE_X, rapl_defaults_hsw_server),
> > - RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_CANNONLAKE_MOBILE, rapl_defaults_core),
> > -
> > - RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT, rapl_defaults_byt),
> > - RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT, rapl_defaults_cht),
> > - RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT_MID, rapl_defaults_tng),
> > - RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT_MID, rapl_defaults_ann),
> > - RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, rapl_defaults_core),
> > - RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT_X, rapl_defaults_core),
> > -
> > - RAPL_CPU(INTEL_FAM6_XEON_PHI_KNL, rapl_defaults_hsw_server),
> > - RAPL_CPU(INTEL_FAM6_XEON_PHI_KNM, rapl_defaults_hsw_server),
> > + INTEL_CPU_FAM6(SANDYBRIDGE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(SANDYBRIDGE_X, rapl_defaults_core),
> > +
> > + INTEL_CPU_FAM6(IVYBRIDGE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(IVYBRIDGE_X, rapl_defaults_core),
> > +
> > + INTEL_CPU_FAM6(HASWELL_CORE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(HASWELL_ULT, rapl_defaults_core),
> > + INTEL_CPU_FAM6(HASWELL_GT3E, rapl_defaults_core),
> > + INTEL_CPU_FAM6(HASWELL_X, rapl_defaults_hsw_server),
> > +
> > + INTEL_CPU_FAM6(BROADWELL_CORE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(BROADWELL_GT3E, rapl_defaults_core),
> > + INTEL_CPU_FAM6(BROADWELL_XEON_D, rapl_defaults_core),
> > + INTEL_CPU_FAM6(BROADWELL_X, rapl_defaults_hsw_server),
> > +
> > + INTEL_CPU_FAM6(SKYLAKE_DESKTOP, rapl_defaults_core),
> > + INTEL_CPU_FAM6(SKYLAKE_MOBILE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(SKYLAKE_X, rapl_defaults_hsw_server),
> > + INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults_core),
> > + INTEL_CPU_FAM6(KABYLAKE_DESKTOP, rapl_defaults_core),
> > + INTEL_CPU_FAM6(CANNONLAKE_MOBILE, rapl_defaults_core),
> > +
> > - INTEL_CPU_FAM6(ATOM_SILVERMONT1, rapl_defaults_byt),
> > ++ INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt),
> > + INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),
> > - INTEL_CPU_FAM6(ATOM_MERRIFIELD, rapl_defaults_tng),
> > - INTEL_CPU_FAM6(ATOM_MOOREFIELD, rapl_defaults_ann),
> > ++ INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, rapl_defaults_tng),
> > ++ INTEL_CPU_FAM6(ATOM_AIRMONT_MID, rapl_defaults_ann),
> > + INTEL_CPU_FAM6(ATOM_GOLDMONT, rapl_defaults_core),
> > - INTEL_CPU_FAM6(ATOM_GEMINI_LAKE, rapl_defaults_core),
> > - INTEL_CPU_FAM6(ATOM_DENVERTON, rapl_defaults_core),
> > ++ INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, rapl_defaults_core),
> > ++ INTEL_CPU_FAM6(ATOM_GOLDMONT_X, rapl_defaults_core),
> > +
> > + INTEL_CPU_FAM6(XEON_PHI_KNL, rapl_defaults_hsw_server),
> > + INTEL_CPU_FAM6(XEON_PHI_KNM, rapl_defaults_hsw_server),
> > {}
> > };
> > MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
> >
> > --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> > Content-Type: application/pgp-signature
> > Content-Description: OpenPGP digital signature
> >
> >
> > --Sig_/bNRy8ryxcqLmcoGqvlETGhp--
>
> This looks good to me too. Andy, any concerns?
Nope, looks good to me!
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2018-10-08 10:34 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 2:44 linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell
2018-10-08 10:06 ` Rafael J. Wysocki
2018-10-08 10:34 ` Andy Shevchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-02-17 5:07 Stephen Rothwell
2021-02-17 10:15 ` Andy Shevchenko
2021-02-22 0:34 ` Stephen Rothwell
2018-10-08 2:40 Stephen Rothwell
2018-10-08 10:05 ` Rafael J. Wysocki
2018-10-08 10:41 ` Andy Shevchenko
2018-03-23 2:20 Stephen Rothwell
2018-03-23 6:09 ` Ingo Molnar
2018-03-23 21:09 ` Rafael J. Wysocki
2018-03-24 8:15 ` Ingo Molnar
2017-11-06 2:10 Stephen Rothwell
2017-11-06 13:09 ` Rafael J. Wysocki
2017-08-11 4:06 Stephen Rothwell
2017-09-04 4:43 ` Stephen Rothwell
2016-11-22 5:48 Stephen Rothwell
2016-06-09 4:34 Stephen Rothwell
2016-04-19 2:59 Stephen Rothwell
2016-03-15 1:55 Stephen Rothwell
2016-03-11 1:57 Stephen Rothwell
2016-03-11 13:51 ` Rafael J. Wysocki
2016-02-29 4:42 Stephen Rothwell
2015-10-06 3:07 Stephen Rothwell
2015-03-31 7:58 Stephen Rothwell
2015-03-31 22:23 ` Rafael J. Wysocki
2015-03-31 7:10 Stephen Rothwell
2014-12-15 2:30 Stephen Rothwell
2014-11-25 5:46 Stephen Rothwell
2014-11-25 21:16 ` Rafael J. Wysocki
2014-08-04 6:55 Stephen Rothwell
2014-05-09 4:49 Stephen Rothwell
2014-01-13 3:29 Stephen Rothwell
2014-01-07 4:20 Stephen Rothwell
2014-01-06 7:18 Stephen Rothwell
2013-08-19 4:09 Stephen Rothwell
2013-04-11 4:08 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='CAHp75Vf7EEpv-oukQCAver==yd28CCYx4aChCaBvg23E1F-YKQ@mail.gmail.com' \
--to=andy.shevchenko@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).