Messages in this thread | | | Date | Thu, 31 Jul 2014 17:07:35 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the tip tree |
| |
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add udelay_test module to validate udelay") from the tip tree and commit 0a8adf584759 ("test: add firmware_class loader test") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc lib/Kconfig.debug index 7cc4e8aff5df,213cd9f7e957..000000000000 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@@ -1659,15 -1649,19 +1659,28 @@@ config TEST_BP If unsure, say N. + config TEST_FIRMWARE + tristate "Test firmware loading via userspace interface" + default n + depends on FW_LOADER + help + This builds the "test_firmware" module that creates a userspace + interface for testing firmware loading. This can be used to + control the triggering of firmware loading without needing an + actual firmware-using device. The contents can be rechecked by + userspace. + + If unsure, say N. + +config TEST_UDELAY + tristate "udelay test driver" + default n + help + This builds the "udelay_test" module that helps to make sure + that udelay() is working properly. + + If unsure, say N. + source "samples/Kconfig" source "lib/Kconfig.kgdb" [unhandled content-type:application/pgp-signature] | |