[lkml]   [2018]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the akpm-current tree with the kbuild tree
Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:


between commit:

06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu")

from the kbuild tree and commit:

bbd89226bb66 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem")

from the akpm-current 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.

Stephen Rothwell

diff --cc lib/Kconfig.debug
index 46f755a60872,01ec99f1cf2e..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1729,10 -1713,9 +1727,9 @@@ config KPROBES_SANITY_TES
bool "Kprobes sanity tests"
depends on DEBUG_KERNEL
depends on KPROBES
- default n
This option provides for testing basic kprobes functionality on
- boot. A sample kprobe, jprobe and kretprobe are inserted and
+ boot. Samples of kprobe and kretprobe are inserted and
verified for functionality.

Say N if you are unsure.
@@@ -1851,12 -1820,8 +1844,11 @@@ config TEST_HAS
This is intended to help people writing architecture-specific
optimized versions. If unsure, say N.

+config TEST_IDA
+ tristate "Perform selftest on IDA functions"
tristate "Perform selftest on priority array manager"
- default n
depends on PARMAN
Enable this option to test priority array manager on boot
@@@ -2062,6 -2018,8 +2045,12 @@@ config IO_STRICT_DEVME

If in doubt, say Y.

+ bool "Additional debug code for syzbot"
+ default n
+ help
+ This option is intended for testing by syzbot.
+source "arch/$(SRCARCH)/Kconfig.debug"
+endmenu # Kernel hacking
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-08-03 10:38    [W:0.033 / U:3.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site