Messages in this thread | | | Date | Thu, 3 Mar 2011 13:44:26 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the acpi tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in lib/Makefile between commit 248852b614cb7713552188a9c2552ba774945733 ("lib, Add lock-less NULL terminated single list") from the acpi tree and commitc 39649c331c70952700f99832b03f87e9d7f5b4b ("lib: cpu_rmap: CPU affinity reverse-mapping") from the net tree.
Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc lib/Makefile index 7cb0608,b73ba01..0000000 --- a/lib/Makefile +++ b/lib/Makefile @@@ -110,8 -110,8 +110,10 @@@ obj-$(CONFIG_ATOMIC64_SELFTEST) += atom obj-$(CONFIG_AVERAGE) += average.o +obj-$(CONFIG_LLIST) += llist.o + + obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o + hostprogs-y := gen_crc32table clean-files := crc32table.h
| |