Hi all,
Today's linux-next merge of the memblock tree got a conflict in:
tools/include/linux/linkage.h
between commits:
f8d92fc527ff ("selftests: vDSO: fix include order in build of test_vdso_chacha")
e08ec2692855 ("tools: Add additional SYM_*() stubs to linkage.h")
from Linus' tree and commit:
d68c08173b70 ("memblock tests: include export.h in linkage.h as kernel dose")
from the memblock 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 tools/include/linux/linkage.h
index a89620c550ed,20dee24d7e1b..000000000000
--- a/tools/include/linux/linkage.h
+++ b/tools/include/linux/linkage.h
@@@ -1,10 -1,6 +1,12 @@@
#ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
#define _TOOLS_INCLUDE_LINUX_LINKAGE_H
+ #include <linux/export.h>
+
+#define SYM_FUNC_START(x) .globl x; x:
+#define SYM_FUNC_END(x)
+#define SYM_DATA_START(x) .globl x; x:
+#define SYM_DATA_START_LOCAL(x) x:
+#define SYM_DATA_END(x)
+
#endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */
Attachment:
pgpRqeJRXzdul.pgp
Description: OpenPGP digital signature
