Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
lib/Makefile
between commit:
df7fcbefa710 ("vdso: Add generic time data storage")
from the tip tree and commit:
db6fe4d61ece ("lib: Move KUnit tests into tests/ subdirectory")
from the kspp 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.
--
Cheers,
Stephen Rothwell
diff --cc lib/Makefile
index 66e44569b141,1e886482a6a3..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -131,7 -121,7 +120,7 @@@ endi
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
- obj-y += math/ crypto/ vdso/
-obj-y += math/ crypto/ tests/
++obj-y += math/ crypto/ vdso/ tests/
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
Attachment:
pgpTk7lzOWkR8.pgp
Description: OpenPGP digital signature
