Promotion of kernel.lnx.4.4-160829.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1050504   I59ddc1b3b677bd0d7fa838afc9a6cbfc10f98409   clk: qcom: Add support for clk_set_flags for branch and
1060151   Id416f0a249d803442847d09ac47781147b0d0ee6   Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a
1058390   I166e3e3854439c8ae15fd1e5a10e671da76ef044   defconfig: msm64: msm: Compile vidc driver as LKM
1039037   Iefa9b5b2becd0c0f4756fa81a396e3af0c45022a   msm_vidc: venc: configure max-B-frames only if B is enab
972773   I33a2f4511eef540c979a3880e7926cbe6cadafe6   radio: iris: uapi header split
1058318   Id431f911d3bdebfeedd0a5c1e36218ce7467ba67   usb: gadget: f_cdev: Handle notification request properl
1058678   I601074304c7061a58e89a9e460e14225a6c1b335   drivers: mfd: Add 1.6MHz clk support for wcd934x codec
1060058   Ie916e7090d3660711159b886c27ee3709891ef2b   phy: qcom-ufs-qmp-v3: add 2 lane phy support
989464   Ibc810525dddf97614db41643642fec7472bd6a2c   mm: zbud: fix the locking scenarios with zcache
1058737   I93b14e22da57a8a47a02080a05a9b8c666970272   input: synaptics_dsx_2.6: correct sysfs permissions
1050517   I242d2f36a6b4af53c658dbaa7a0f32e46cd3af33   clk: qcom: Add support for dummy reset controller
1060058   Ifa2bac71b47ce49a6fb31ebb8dd54b243e1cfae1   scsi: ufs: add 2 lane support
1054969   I9788412af3a34aca8fa8519e7ae6f3349f263a1e   sound: usb: Add NULL check on return value of iommu_doma

Change-Id: I80b6965e9d40c4cbefd180f323736f8f71778eaf
CRs-Fixed: 1050504, 1058390, 1054969, 989464, 1058318, 1060058, 1060151, 1039037, 1058737, 1058678, 972773, 1050517

2 files changed, 10 insertions, 13 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index dd243d2abd87..0b7dc2fd7bac 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -267,8 +267,10 @@ int conf_read_simple(const char *name, int def)
 		if (in)
 			goto load;
 		sym_add_change_count(1);
-		if (!sym_defconfig_list)
+		if (!sym_defconfig_list) {
+			sym_calc_value(modules_sym);
 			return 1;
+		}
 
 		for_all_defaults(sym_defconfig_list, prop) {
 			if (expr_calc_value(prop->visible.expr) == no ||
@@ -401,6 +403,7 @@ setsym:
 	}
 	free(line);
 	fclose(in);
+	sym_calc_value(modules_sym);
 	return 0;
 }
 
@@ -411,12 +414,8 @@ int conf_read(const char *name)
 
 	sym_set_change_count(0);
 
-	if (conf_read_simple(name, S_DEF_USER)) {
-		sym_calc_value(modules_sym);
+	if (conf_read_simple(name, S_DEF_USER))
 		return 1;
-	}
-
-	sym_calc_value(modules_sym);
 
 	for_all_symbols(i, sym) {
 		sym_calc_value(sym);
@@ -847,7 +846,6 @@ static int conf_split_config(void)
 
 	name = conf_get_autoconfig_name();
 	conf_read_simple(name, S_DEF_AUTO);
-	sym_calc_value(modules_sym);
 
 	if (chdir("include/config"))
 		return 1;
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index a2c0d620ca80..c2423d913b46 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -266,9 +266,9 @@ do_file(char const *const fname)
 		break;
 	}  /* end switch */
 	if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
-	||  (r2(&ehdr->e_type) != ET_EXEC && r2(&ehdr->e_type) != ET_DYN)
+	||  r2(&ehdr->e_type) != ET_EXEC
 	||  ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
-		fprintf(stderr, "unrecognized ET_EXEC/ET_DYN file %s\n", fname);
+		fprintf(stderr, "unrecognized ET_EXEC file %s\n", fname);
 		fail_file();
 	}
 
@@ -282,13 +282,12 @@ do_file(char const *const fname)
 	case EM_386:
 	case EM_X86_64:
 	case EM_S390:
-	case EM_AARCH64:
-	case EM_PARISC:
 		custom_sort = sort_relative_table;
 		break;
 	case EM_ARCOMPACT:
 	case EM_ARCV2:
 	case EM_ARM:
+	case EM_AARCH64:
 	case EM_MICROBLAZE:
 	case EM_MIPS:
 	case EM_XTENSA:
@@ -305,7 +304,7 @@ do_file(char const *const fname)
 		if (r2(&ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
 		||  r2(&ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
 			fprintf(stderr,
-				"unrecognized ET_EXEC/ET_DYN file: %s\n", fname);
+				"unrecognized ET_EXEC file: %s\n", fname);
 			fail_file();
 		}
 		do32(ehdr, fname, custom_sort);
@@ -315,7 +314,7 @@ do_file(char const *const fname)
 		if (r2(&ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
 		||  r2(&ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
 			fprintf(stderr,
-				"unrecognized ET_EXEC/ET_DYN file: %s\n", fname);
+				"unrecognized ET_EXEC file: %s\n", fname);
 			fail_file();
 		}
 		do64(ghdr, fname, custom_sort);