linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree
Subsystems (2)
Mark Brown
maintainerHi all,
Today's linux-next merge of the kbuild tree got a conflict in:
scripts/kallsyms.c
between commit:
edd7005a42d42 ("kallsyms: increase marker density to 16:1 to accelerate lookups")
from the mm-nonmm-unstable tree and commit:
531980b4b17e9 ("kallsyms: reimplement mksysmap in C")
from the kbuild 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.
scripts/kallsyms.c +0 -0
@@@ -26,12 -33,10 +33,11 @@@#include <string.h> #include <ctype.h> #include <limits.h> - +#include <sys/stat.h> #include <xalloc.h> +#include "../kernel/kallsyms_internal.h" - -#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof(arr[0])) +#include "kallsyms.h" #define KSYM_NAME_LEN 512 markers =xmalloc (sizeof (*markers) * markers_cnt);output_label ("kallsyms_names" ); + bin_start =bin_pos (out_bin_file); off =0 ;for (i =0 ; i < table_cnt; i++) { - if ((i & 0xFF) == 0) - markers[i >>8 ] = off; + if ((i & KALLSYMS_MARKER_MASK) == 0) + markers[i >>KALLSYMS_MARKER_SHIFT ] = off; table[i]->seq = i;/* There cannot be any symbol of length zero. */
Quoted 14 lines · Mark Brown
Hi all,
Today's linux-next merge of the kbuild tree got a conflict in:
scripts/kallsyms.cbetween commit:
edd7005a42d42("kallsyms: increase marker density to 16:1 to accelerate lookups")from the mm-nonmm-unstable tree and commit:
531980b4b17e9("kallsyms: reimplement mksysmap in C")
Quoted 8 lines
from the kbuild 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.
Looks correct to me, thanks!
--
Cheers, Lorenzo