* linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree
@ 2021-12-24 2:14 Stephen Rothwell
2021-12-24 20:10 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-12-24 2:14 UTC (permalink / raw
To: Greg KH, Hans de Goede, Mark Gross
Cc: Andy Shevchenko, David E. Box, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree
2021-12-24 2:14 linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree Stephen Rothwell
@ 2021-12-24 20:10 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2021-12-24 20:10 UTC (permalink / raw
To: Stephen Rothwell
Cc: Greg KH, Hans de Goede, Mark Gross, David E. Box,
Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Dec 24, 2021 at 01:14:50PM +1100, Stephen Rothwell wrote:
> 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.
Fix is correct, thanks!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-24 20:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-24 2:14 linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree Stephen Rothwell
2021-12-24 20:10 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.