Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time
config") from the tip tree and commit 985a94a96d29 ("um: Remove
CONFIG_IRQ_RELEASE_METHOD") from the signal tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/um/Kconfig.common
index 806185d,43ef890..0000000
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@@ -53,11 -52,10 +53,6 @@@ config GENERIC_BU
default y
depends on BUG
- # Used in kernel/irq/manage.c and include/linux/irq.h
- config IRQ_RELEASE_METHOD
- bool
- default y
-
-config GENERIC_CLOCKEVENTS
- bool
- default y
-
config HZ
int
default 100
Attachment:
pgpusN7r1clcV.pgp
Description: PGP signature
