Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5401198pxv;
        Wed, 28 Jul 2021 09:51:10 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJylT0csIc/odbjVtLE8kqQ4URZsXY4BnjXhHIbTVXC+MKeafhBXrnk36E1qaghOSjLNz3uv
X-Received: by 2002:a92:db44:: with SMTP id w4mr482600ilq.101.1627491069785;
        Wed, 28 Jul 2021 09:51:09 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1627491069; cv=none;
        d=google.com; s=arc-20160816;
        b=xvq55xmyN88IzOgM5yB2lW0NAbtvGcleo6WzpjU+RlBTsuQbJmYqptKff1BgCGLMX5
         SxJRYb5xRbA30ylNeCwKHR5E6xLi7w+/Zg9qP5NiWJuusK/f93/iZHmLevOaF3/e4EmE
         Xq0AdGdMQq4fSp7gsE+k/ZlXXsZBPRT07S5kkUVTLte8Y89qYSdPmZJYMUs+4MSFlHP8
         c/W2g33/2IXqS4X3uCf7iusOEVPm/VVDPXzVVR9yZCdYm8yGBTaxuH+1F42P4hwEncL9
         cTOH0KPDIh5bYdY1eRS7jdNr+PEzTp4n+r8pFK6MIlA5TsqxiCygJFPKawBM4f/yLU3B
         tBmA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:content-transfer-encoding:mime-version
         :message-id:date:subject:cc:to:from:dkim-signature;
        bh=JrQH8lWMfsi2RVDBbFhYPncGeI8B+IpsgcXSnlIc13g=;
        b=LxBUGV9KSFAha/+rJyoBxeDsgU5yTu7GKxOEu8NyF0Kn1Z2QzlyZ3OQnJFeeWK1Lyu
         W2QaxCkgfgUcMg8pt9q7w5PlxNWN4NUqb5KiTSKUfjqpDvxQA71LnsVY/30QfgmERTy2
         qGwwtR1CrfWEnNBlPxML4QupzMl7/U1qJzyp+d2LLvEzscPk96YoJdWC0aTYVRIs2Lad
         YqVxjWwpBBKuCnuG2DUB43QjhjEUO761J8CCa8X6v4moMdablEiaBRmBGsg+0WRGCZpn
         Jo83sj6LoPbx8zUqif0gKnxMHEgGU5sG/D8sYlDEOfN96pPr/7FjJ+/MsKouqgTbTHNy
         D91Q==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@kernel.org header.s=k20201202 header.b="H/9sm8PT";
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id x4si320923ilj.71.2021.07.28.09.50.58;
        Wed, 28 Jul 2021 09:51:09 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@kernel.org header.s=k20201202 header.b="H/9sm8PT";
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229729AbhG1QtG (ORCPT <rfc822;linux.whf@gmail.com> + 99 others);
        Wed, 28 Jul 2021 12:49:06 -0400
Received: from mail.kernel.org ([198.145.29.99]:43128 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S229537AbhG1QtF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 28 Jul 2021 12:49:05 -0400
Received: by mail.kernel.org (Postfix) with ESMTPSA id 4AF1260EB9;
        Wed, 28 Jul 2021 16:49:03 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=k20201202; t=1627490943;
        bh=FKqbqCd321Vu1qA1WxXaxi8ArsIJvFzWb9kp8ZOmwMk=;
        h=From:To:Cc:Subject:Date:From;
        b=H/9sm8PTk+VoIljeox2RDuudekoouVrSp33e2Zdv2061pbDYGzMTFOhSqQz52l/FY
         mc0R/OLWt+SUQ0s1oZ96JFjxGaWhHGdloz/xCh7Xrsf6ErkFg8Hsfy9fzrhyFgz4nX
         g0fR45atZzpbk92CMrkXXyUQLmuEKaRsd0IkZfb7PPO9Lcs4+Zxuar3eyJbZIMnx7D
         W3tqGe1G9JdxiERZdrDgDIRtoGaODKrfNpHHrX3Ow/JJ6eUvvNJHaHgj+I/OzLlaff
         fNQowHh3dkuPPwjJ2qwmW90uJlb4QvKlBTVtfLnJxtEksUXdTntqD7Gq1lQyk6qeh4
         bKXfvkM3+O9uw==
From:   Mark Brown <broonie@kernel.org>
To:     Hans de Goede <hdegoede@redhat.com>,
        Mark Gross <mark.gross@intel.com>,
        Gayatri Kammela <gayatri.kammela@intel.com>,
        Andy Shevchenko <andy.shevchenko@gmail.com>,
        Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        platform-driver-x86@vger.kernel.org
Subject: linux-next: build failure after merge of the drivers-x86 tree
Date:   Wed, 28 Jul 2021 17:48:47 +0100
Message-Id: <20210728164847.46855-1-broonie@kernel.org>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

After merging the drivers-x86 tree, today's linux-next build
(x86 allmodconfig) failed like this:

error: the following would cause module name conflict:
  drivers/misc/c2port/core.ko
  drivers/platform/x86/intel/pmc/core.ko

Caused by commit

  29036fcc92b22d ("platform/x86/intel: intel_pmc_core: Move intel_pmc_core* files to pmc subfolder")

Since there was nothing in the branch yesterday I've just dropped the
tree entirely.