Hi all,
Today's linux-next merge of the sched tree got a conflict in lib/Makefile
between commit 889c92d21db40be0b7d22a59395060237895bb85 ("bzip2/lzma:
centralize format detection") from the x86 tree and commit
ceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0 ("sched: make plist a library
facility") from the sched tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc lib/Makefile
index 1173a43,902d738..0000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -12,7 -12,7 +12,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o prio_heap.o ratelimit.o show_mem.o \
- is_single_threaded.o decompress.o
- is_single_threaded.o plist.o
++ is_single_threaded.o decompress.o plist.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
