linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHp75VdaCfEBp0co611O8uCpu9fzOaobcE7EmZyHsX0D=4=neQ@mail.gmail.com>
Date:   Wed, 1 Apr 2020 09:49:48 +0300
From:   Andy Shevchenko <andy.shevchenko@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Darren Hart <dvhart@...radead.org>,
        Gayatri Kammela <gayatri.kammela@...el.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Borislav Petkov <bp@...e.de>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the tip tree

On Wed, Apr 1, 2020 at 6:14 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drivers-x86 tree got a conflict in:
> >
> >   drivers/platform/x86/intel_pmc_core.c
> >
> > between commit:
> >
> >   a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")
> >
> > from the tip tree and commit:
> >
> >   16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")
> >
> > 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.

> This is now a conflict between the drivers-x86 tree and Linus' tree.

PDx86 is in Linus tree with conflict resolution.

-- 
With Best Regards,
Andy Shevchenko