From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Hans de Goede <hdegoede@redhat•com>,
Mark Gross <markgross@kernel•org>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
"David E. Box" <david.e.box@linux•intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree
Date: Fri, 24 Dec 2021 13:14:50 +1100 [thread overview]
Message-ID: <20211224131450.2c7e0dae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/platform/x86/intel/Kconfig
between commit:
4f6c131c3c31 ("platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL")
from the drivers-x86-fixes tree and commit:
a3c8f906ed5f ("platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus")
from the driver-core 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/platform/x86/intel/Kconfig
index 40096b25994a,35a5d1a5eba8..000000000000
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@@ -170,3 -183,16 +170,14 @@@ config INTEL_UNCORE_FREQ_CONTRO
To compile this driver as a module, choose M here: the module
will be called intel-uncore-frequency.
+
+ config INTEL_VSEC
+ tristate "Intel Vendor Specific Extended Capabilities Driver"
+ depends on PCI
+ select AUXILIARY_BUS
+ help
+ Adds support for feature drivers exposed using Intel PCIe VSEC and
+ DVSEC.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel_vsec.
-
-endif # X86_PLATFORM_DRIVERS_INTEL
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-12-24 2:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-24 2:14 Stephen Rothwell [this message]
2021-12-24 20:10 ` linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree Andy Shevchenko
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=20211224131450.2c7e0dae@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=david.e.box@linux$(echo .)intel.com \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markgross@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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