Hi all, Today's linux-next merge of the akpm tree got a conflict in: lib/Kconfig.debug between commit: 54dc8d00a0be ("drivers: hv: vmbus: Introduce latency testing") from the hyperv tree and patch: "kernel-hacking: create submenu for arch special debugging options" from the akpm 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 lib/Kconfig.debug index 905ce80e6ac4,9a6d7e4955a5..000000000000 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@@ -2156,13 -2156,10 +2156,17 @@@ config DEBUG_AID_FOR_SYZBO help This option is intended for testing by syzbot. + menu "$(SRCARCH) Debugging" + source "arch/$(SRCARCH)/Kconfig.debug" + endmenu + +config HYPERV_TESTING + bool "Microsoft Hyper-V driver testing" + default n + depends on HYPERV && DEBUG_FS + help + Select this option to enable Hyper-V vmbus testing. + endmenu # Kernel hacking
Attachment:
pgp4ujfc0cxe1.pgp
Description: OpenPGP digital signature