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

[Andy Shevchenko]

On Mon, Oct 8, 2018 at 6:44 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
>
>   drivers/platform/x86/intel_int0002_vgpio.c
>
> between commit:
>
>   f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
>
> from the tip tree and commit:
>
>   96402de65afc ("platform/x86: intel_int0002_vgpio: Enable the driver on Bay Trail platforms")
>
> 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.
>

Looks good to me!

> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/platform/x86/intel_int0002_vgpio.c
> index e89ad4964dc1,c958a628c375..000000000000
> --- a/drivers/platform/x86/intel_int0002_vgpio.c
> +++ b/drivers/platform/x86/intel_int0002_vgpio.c
> @@@ -57,11 -54,7 +54,7 @@@
>   #define ICPU(model)   { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
>
>   static const struct x86_cpu_id int0002_cpu_ids[] = {
> - /*
> -  * Limit ourselves to Cherry Trail for now, until testing shows we
> -  * need to handle the INT0002 device on Baytrail too.
> -  *    ICPU(INTEL_FAM6_ATOM_SILVERMONT),        * Valleyview, Bay Trail *
> -  */
>  -      ICPU(INTEL_FAM6_ATOM_SILVERMONT1),      /* Valleyview, Bay Trail  */
> ++      ICPU(INTEL_FAM6_ATOM_SILVERMONT),       /* Valleyview, Bay Trail  */
>         ICPU(INTEL_FAM6_ATOM_AIRMONT),          /* Braswell, Cherry Trail */
>         {}
>   };



-- 
With Best Regards,
Andy Shevchenko