From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7115C2D0F3 for ; Wed, 1 Apr 2020 06:50:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77BF22071A for ; Wed, 1 Apr 2020 06:50:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ply97Xef" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731871AbgDAGuC (ORCPT ); Wed, 1 Apr 2020 02:50:02 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:39394 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731741AbgDAGuC (ORCPT ); Wed, 1 Apr 2020 02:50:02 -0400 Received: by mail-pf1-f194.google.com with SMTP id k15so6515285pfh.6; Tue, 31 Mar 2020 23:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tmKJc7NjnxN20fuxF0kGLk0WWkFLy1YBAKU11CgTRL4=; b=Ply97XefMOgToljx9G/prcmyZ5K+d4DiZkRr5icJcP1YU0B9AOzcIBAPnXaLRb0P1M b0sWz5eRki8aj0w/9YgHdfHjzt/Xuc7GUfdaENJVOD6gZG5jXtgUnBy+jmMerQPPMAeK VibfpN6+N3fd/ThOZbzZsB2PSoiuXFz94YpkGqPhBKpu6ZYanEvWw9uL1ZI45KyYQw6Y 3TGM9UJc47Tsc2CggzCBoElod9uu9B18M4aY432KqgZC2jXo0GtjIOW55jnqj8km9eNW Q1QNTOwjFAcF1+sZLfw+cLmqoDhky1fEmMZx8OEnYjhQVdab3x0Nv5m71jjFdk90I5nw yDMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tmKJc7NjnxN20fuxF0kGLk0WWkFLy1YBAKU11CgTRL4=; b=HFFwwyhcVTouufhRJr7qc6U0B08ESAjmMSe8PzF05rleofLvF5xYjmicCpSeF8exJH l6MJ4sPdBorvkSZd7HsSvl56amK4Di6/7ZzsySxG9o8cQ1oDjcjxAeL2EOhBpxwX5DS8 ulfiU8cqIpkmWtx1XDAunoNIyYVHZSxHv5ipcL4fa5TTiyBrmsktMgHb1tSYFjwgNfiQ QcxfB86xXC1hkCV63RNrjlTqp/dOJDOIpWCRvpETEGZlK6vRmfWlP/9YNsNsvBEIaLM+ 4Opjq1TU4FDTy+eowosYfrFHkd4cA6JpjB5+HxcPc9iVc021AfNEnWqGlEIK1fZxOkDQ S6EA== X-Gm-Message-State: AGi0PubJodXptgfZYvZbJC+Ycim38dPT/9RU2lUWoVIYslW/KtYqh0C8 Dqzt7ENP/Qmyoz14LoH2LpffbKRu0kVd1TIybv4= X-Google-Smtp-Source: APiQypJt8Tz9kYfeUxwq4p2WKLozKFChbs8KbZhYo6DlzntkZ3gcahNcIMJwo0Bl0X052O5PcRgloHA8BSrJZ0ywaYc= X-Received: by 2002:a05:6a00:2b4:: with SMTP id q20mr8515775pfs.36.1585723800741; Tue, 31 Mar 2020 23:50:00 -0700 (PDT) MIME-Version: 1.0 References: <20200326150523.02c4ec48@canb.auug.org.au> <20200401141409.446e989b@canb.auug.org.au> In-Reply-To: <20200401141409.446e989b@canb.auug.org.au> From: Andy Shevchenko Date: Wed, 1 Apr 2020 09:49:48 +0300 Message-ID: Subject: Re: linux-next: manual merge of the drivers-x86 tree with the tip tree To: Stephen Rothwell Cc: Darren Hart , Gayatri Kammela , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List , Borislav Petkov Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 1, 2020 at 6:14 AM Stephen Rothwell wrote: > On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell 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