diff --git a/device/linux-samsung-klte/00_fix_return_address.patch b/device/linux-samsung-klte/00_fix_return_address.patch
index 287d1f707..322bf73c9 100644
--- a/device/linux-samsung-klte/00_fix_return_address.patch
+++ b/device/linux-samsung-klte/00_fix_return_address.patch
@@ -35,9 +35,9 @@ diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
 index fafedd86885dd..f6aa84d5b93c9 100644
 --- a/arch/arm/kernel/return_address.c
 +++ b/arch/arm/kernel/return_address.c
-@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
+@@ -58,11 +58,6 @@ void *return_address(unsigned int level)
+ 
+ #else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
  
 -void *return_address(unsigned int level)
 -{
diff --git a/device/linux-samsung-klte/02_gpu-msm-fix-gcc5-compile.patch b/device/linux-samsung-klte/01_gpu-msm-fix-gcc5-compile.patch
similarity index 66%
rename from device/linux-samsung-klte/02_gpu-msm-fix-gcc5-compile.patch
rename to device/linux-samsung-klte/01_gpu-msm-fix-gcc5-compile.patch
index 91b17cd76..f1a491984 100644
--- a/device/linux-samsung-klte/02_gpu-msm-fix-gcc5-compile.patch
+++ b/device/linux-samsung-klte/01_gpu-msm-fix-gcc5-compile.patch
@@ -1,5 +1,7 @@
-source:
-https://github.com/ShinySide/HispAsian_Lollipop_G6/commit/b7756b6fc4bb728722b14d2dfdbaf1dc843812e9
+From b7756b6fc4bb728722b14d2dfdbaf1dc843812e9 Mon Sep 17 00:00:00 2001
+From: Chet Kener <Cl3Kener@gmail.com>
+Date: Tue, 21 Oct 2014 18:41:36 -0400
+Subject: [PATCH] gpu:msm: Fix 5.0 compile
 
 * These need to be static to avoid these errors:
 
@@ -10,10 +12,15 @@ Makefile:877: recipe for target '.tmp_vmlinux1' failed
 make: *** [.tmp_vmlinux1] Error 1
 
 Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
+---
+ drivers/gpu/msm/kgsl_iommu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
+index c4fa8af4..4f66a2f0 100644
 --- a/drivers/gpu/msm/kgsl_iommu.c
 +++ b/drivers/gpu/msm/kgsl_iommu.c
-@@ -1010,7 +1010,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu)
+@@ -1002,7 +1002,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu)
   *
   * Return - int - number of commands.
   */
@@ -22,7 +29,7 @@ Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
  						unsigned int *cmds)
  {
  	struct kgsl_device *device = mmu->device;
-@@ -1080,7 +1080,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
+@@ -1072,7 +1072,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
   *
   * Return - int - number of commands.
   */
diff --git a/device/linux-samsung-klte/01_timeconst_fix.patch b/device/linux-samsung-klte/01_timeconst_fix.patch
deleted file mode 100644
index 02abadd38..000000000
--- a/device/linux-samsung-klte/01_timeconst_fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 63a3f603413ffe82ad775f2d62a5afff87fd94a0 Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin" <hpa@linux.intel.com>
-Date: Thu, 7 Feb 2013 17:14:08 -0800
-Subject: [PATCH] timeconst.pl: Eliminate Perl warning
-
-defined(@array) is deprecated in Perl and gives off a warning.
-Restructure the code to remove that warning.
-
-[ hpa: it would be interesting to revert to the timeconst.bc script.
-  It appears that the failures reported by akpm during testing of
-  that script was due to a known broken version of make, not a problem
-  with bc.  The Makefile rules could probably be restructured to avoid
-  the make bug, or it is probably old enough that it doesn't matter. ]
-
-Reported-by: Andi Kleen <ak@linux.intel.com>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
----
-Patch status: upstream
-
- kernel/timeconst.pl | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
-index eb51d76..3f42652 100644
---- a/kernel/timeconst.pl
-+++ b/kernel/timeconst.pl
-@@ -369,10 +369,8 @@ if ($hz eq '--can') {
- 		die "Usage: $0 HZ\n";
- 	}
- 
--	@val = @{$canned_values{$hz}};
--	if (!defined(@val)) {
--		@val = compute_values($hz);
--	}
-+	$cv = $canned_values{$hz};
-+	@val = defined($cv) ? @$cv : compute_values($hz);
- 	output($hz, @val);
- }
- exit 0;
--- 
-2.4.10
-
diff --git a/device/linux-samsung-klte/02-Reduce-battery-and-touchscreen-log-spam.patch b/device/linux-samsung-klte/02-Reduce-battery-and-touchscreen-log-spam.patch
new file mode 100644
index 000000000..b73226f9c
--- /dev/null
+++ b/device/linux-samsung-klte/02-Reduce-battery-and-touchscreen-log-spam.patch
@@ -0,0 +1,647 @@
+From c467cfc3b24ccf4ae5a6153a89eb3805906ce72b Mon Sep 17 00:00:00 2001
+From: drebrez <drebrez@gmail.com>
+Date: Sun, 2 Dec 2018 22:36:11 +0100
+Subject: [PATCH] Reduce battery and touchscreen log spam
+
+---
+ drivers/battery/max17048_fuelgauge.c          |   7 +-
+ drivers/battery/max77804k_charger.c           |  24 ++--
+ drivers/battery/sec_battery.c                 | 135 ++++++++++--------
+ drivers/battery/sec_fuelgauge.c               |   7 +-
+ drivers/fingerprint/fingerprint.h             |   7 +-
+ drivers/fingerprint/vfs61xx.c                 |  29 ++--
+ .../touchscreen/synaptics/synaptics_i2c_rmi.c |  12 +-
+ drivers/thermal/msm_thermal.c                 |  56 ++++----
+ 8 files changed, 147 insertions(+), 130 deletions(-)
+
+diff --git a/drivers/battery/max17048_fuelgauge.c b/drivers/battery/max17048_fuelgauge.c
+index ef07336db85..45e3672e75d 100644
+--- a/drivers/battery/max17048_fuelgauge.c
++++ b/drivers/battery/max17048_fuelgauge.c
+@@ -410,9 +410,10 @@ static int max17048_get_soc(struct i2c_client *client)
+ 		soc = (data[0] * 100) + (data[1] * 100 / 256);
+ 	}
+ 
+-	dev_info(&client->dev,
+-		"%s : raw capacity (%d), data(0x%04x)\n",
+-		__func__, soc, (data[0]<<8) | data[1]);
++	// disable log spam
++	//dev_info(&client->dev,
++	//	"%s : raw capacity (%d), data(0x%04x)\n",
++	//	__func__, soc, (data[0]<<8) | data[1]);
+ 
+ 	return soc;
+ }
+diff --git a/drivers/battery/max77804k_charger.c b/drivers/battery/max77804k_charger.c
+index 376e2bd5cbf..7558a585e2d 100644
+--- a/drivers/battery/max77804k_charger.c
++++ b/drivers/battery/max77804k_charger.c
+@@ -343,7 +343,7 @@ static void max77804k_set_input_current(struct max77804k_charger_data *charger,
+ 			set_reg, 0x19);
+ 
+ #if defined(CONFIG_MACH_KLTE_CTC)
+-		pr_info("%s: qpnp_pon_set_wd_timer 2s\n", __func__);
++		pr_debug("%s: qpnp_pon_set_wd_timer 2s\n", __func__);
+ 		qpnp_pon_set_wd_timer(1, 1, 0x8);
+ 		msleep(10);
+ #endif
+@@ -352,7 +352,7 @@ static void max77804k_set_input_current(struct max77804k_charger_data *charger,
+ 
+ #if defined(CONFIG_MACH_KLTE_CTC)
+ 		msleep(10);
+-		pr_info("%s: qpnp_pon_set_wd_timer 18s\n", __func__);
++		pr_debug("%s: qpnp_pon_set_wd_timer 18s\n", __func__);
+ 		qpnp_pon_set_wd_timer(17, 1, 0xE);
+ #endif
+ 		goto exit;
+@@ -385,7 +385,7 @@ static void max77804k_set_input_current(struct max77804k_charger_data *charger,
+ 					set_current_reg = (MINIMUM_INPUT_CURRENT / charger->input_curr_limit_step);
+ 				max77804k_write_reg(charger->max77804k->i2c,
+ 						set_reg, set_current_reg);
+-				pr_info("%s: set_current_reg(0x%02x)\n", __func__, set_current_reg);
++				pr_debug("%s: set_current_reg(0x%02x)\n", __func__, set_current_reg);
+ 				chg_state = max77804k_get_charger_state(charger);
+ 				if ((chg_state != POWER_SUPPLY_STATUS_CHARGING) &&
+ 						(chg_state != POWER_SUPPLY_STATUS_FULL))
+@@ -436,7 +436,7 @@ static void max77804k_set_input_current(struct max77804k_charger_data *charger,
+ 			curr_step /= 2;
+ 			max77804k_write_reg(charger->max77804k->i2c,
+ 					set_reg, now_current_reg);
+-			pr_info("%s: now_current_reg(0x%02x)\n", __func__, now_current_reg);
++			pr_debug("%s: now_current_reg(0x%02x)\n", __func__, now_current_reg);
+ 			chg_state = max77804k_get_charger_state(charger);
+ 			if ((chg_state != POWER_SUPPLY_STATUS_CHARGING) &&
+ 					(chg_state != POWER_SUPPLY_STATUS_FULL))
+@@ -450,7 +450,7 @@ static void max77804k_set_input_current(struct max77804k_charger_data *charger,
+ 	}
+ 
+ set_input_current:
+-	pr_info("%s: reg_data(0x%02x), input(%d)\n",
++	pr_debug("%s: reg_data(0x%02x), input(%d)\n",
+ 		__func__, set_current_reg, cur);
+ 	max77804k_write_reg(charger->max77804k->i2c,
+ 		set_reg, set_current_reg);
+@@ -474,14 +474,14 @@ static int max77804k_get_input_current(struct max77804k_charger_data *charger)
+ 	if (charger->cable_type == POWER_SUPPLY_TYPE_WIRELESS) {
+ 		max77804k_read_reg(charger->max77804k->i2c,
+ 				MAX77804K_CHG_REG_CHG_CNFG_10, &reg_data);
+-		pr_info("%s: CHG_CNFG_10(0x%02x)\n", __func__, reg_data);
++		// pr_info("%s: CHG_CNFG_10(0x%02x)\n", __func__, reg_data);
+ 		/* AND operation for removing the formal 2bit  */
+ 		reg_data = reg_data & 0x3F;
+ 		charger->input_curr_limit_step = 20;
+ 	} else {
+ 		max77804k_read_reg(charger->max77804k->i2c,
+ 				MAX77804K_CHG_REG_CHG_CNFG_09, &reg_data);
+-		pr_info("%s: CHG_CNFG_09(0x%02x)\n", __func__, reg_data);
++		// pr_info("%s: CHG_CNFG_09(0x%02x)\n", __func__, reg_data);
+ 		/* AND operation for removing the formal 1bit  */
+ 		reg_data = reg_data & 0x7F;
+ 		if (charger->pmic_ver == 0x04)
+@@ -521,7 +521,7 @@ static void max77804k_set_topoff_current(struct max77804k_charger_data *charger,
+ 	/* the unit of timeout is second*/
+ 	timeout = timeout / 60;
+ 	reg_data |= ((timeout / 10) << 3);
+-	pr_info("%s: reg_data(0x%02x), topoff(%d)\n", __func__, reg_data, cur);
++	pr_debug("%s: reg_data(0x%02x), topoff(%d)\n", __func__, reg_data, cur);
+ 
+ 	max77804k_write_reg(charger->max77804k->i2c,
+ 		MAX77804K_CHG_REG_CHG_CNFG_03, reg_data);
+@@ -793,7 +793,7 @@ static int max77804k_get_health_state(struct max77804k_charger_data *charger)
+ 
+ 	reg_data = ((reg_data & MAX77804K_BAT_DTLS) >> MAX77804K_BAT_DTLS_SHIFT);
+ 
+-	pr_info("%s: bat_dtls(0x%x) int_mask(0x%x)\n", __func__, reg_data, chg_int_mask);
++	// pr_info("%s: bat_dtls(0x%x) int_mask(0x%x)\n", __func__, reg_data, chg_int_mask);
+ 	switch (reg_data) {
+ 	case 0x00:
+ 		pr_info("%s: No battery and the charger is suspended\n",
+@@ -864,7 +864,7 @@ static int max77804k_get_health_state(struct max77804k_charger_data *charger)
+ 					__func__, chg_cnfg_09, chg_cnfg_12);
+ 		}
+ 
+-		pr_info("%s: vbus_state : 0x%d, chg_dtls : 0x%d\n", __func__, vbus_state, chg_dtls);
++		// pr_info("%s: vbus_state : 0x%d, chg_dtls : 0x%d\n", __func__, vbus_state, chg_dtls);
+ 		/*  OVP is higher priority */
+ 		if (vbus_state == 0x02) { /*  CHGIN_OVLO */
+ 			pr_info("%s: vbus ovp\n", __func__);
+@@ -964,7 +964,7 @@ static int sec_chg_get_property(struct power_supply *psy,
+ #if defined(WPC_CHECK_CVPRM_FEATURE) || defined(CONFIG_BATTERY_SWELLING)
+ 	case POWER_SUPPLY_PROP_VOLTAGE_MAX:
+ 		val->intval = max77804k_get_charge_votage(charger);
+-		pr_info("%s: Float voltage : 0x%x\n", __func__, val->intval);
++		pr_debug("%s: Float voltage : 0x%x\n", __func__, val->intval);
+ 		break;
+ #endif
+ 	default:
+@@ -1215,7 +1215,7 @@ static int sec_chg_set_property(struct power_supply *psy,
+ 		pr_info("%s: Float voltage set to : 0x%x\n", __func__, reg_data);
+ 		break;
+ 	case  POWER_SUPPLY_PROP_CHARGING_ENABLED:
+-		pr_info("%s: charger enable(%d)\n", __func__, val->intval);
++		pr_debug("%s: charger enable(%d)\n", __func__, val->intval);
+ 		max77804k_set_charger_state(charger, val->intval);
+ 		charger->is_charging = val->intval;
+ 		break;
+diff --git a/drivers/battery/sec_battery.c b/drivers/battery/sec_battery.c
+index bd656f31acf..c15ae734d19 100644
+--- a/drivers/battery/sec_battery.c
++++ b/drivers/battery/sec_battery.c
+@@ -486,7 +486,7 @@ static bool sec_bat_check_vf_adc(struct sec_battery_info *battery)
+ 		(battery->check_adc_value >= battery->pdata->check_adc_min)) {
+ 		return true;
+ 	} else {
+-		dev_info(battery->dev, "%s: adc (%d)\n", __func__, battery->check_adc_value);
++		//dev_info(battery->dev, "%s: adc (%d)\n", __func__, battery->check_adc_value);
+ 		return false;
+ 	}
+ }
+@@ -655,8 +655,8 @@ static bool sec_bat_battery_cable_check(struct sec_battery_info *battery)
+ 		if (battery->check_count < battery->pdata->check_count)
+ 			battery->check_count++;
+ 		else {
+-			dev_err(battery->dev,
+-				"%s: Battery Disconnected\n", __func__);
++			//dev_err(battery->dev,
++			//	"%s: Battery Disconnected\n", __func__);
+ 			battery->present = false;
+ 			battery->health = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+ 
+@@ -697,7 +697,8 @@ static bool sec_bat_battery_cable_check(struct sec_battery_info *battery)
+ 		}
+ 	}
+ 
+-	dev_info(battery->dev, "%s: Battery Connected\n", __func__);
++	// disable log spam
++	// dev_info(battery->dev, "%s: Battery Connected\n", __func__);
+ 
+ 	if (battery->pdata->cable_check_type &
+ 		SEC_BATTERY_CABLE_CHECK_POLLING) {
+@@ -746,8 +747,8 @@ static bool sec_bat_ovp_uvlo_result(
+ 		battery->health = health;
+ 		switch (health) {
+ 		case POWER_SUPPLY_HEALTH_GOOD:
+-			dev_info(battery->dev, "%s: Safe voltage\n", __func__);
+-			dev_info(battery->dev, "%s: is_recharging : %d\n", __func__, battery->is_recharging);
++			//dev_info(battery->dev, "%s: Safe voltage\n", __func__);
++			//dev_info(battery->dev, "%s: is_recharging : %d\n", __func__, battery->is_recharging);
+ 			sec_bat_set_charging_status(battery,
+ 				POWER_SUPPLY_STATUS_CHARGING);
+ 			if (battery->siop_level != 100)
+@@ -914,8 +915,9 @@ static bool sec_bat_voltage_check(struct sec_battery_info *battery)
+ 	int recharge_condition_vcell = battery->pdata->recharge_condition_vcell;
+ 
+ 	if (battery->status == POWER_SUPPLY_STATUS_DISCHARGING) {
+-		dev_dbg(battery->dev,
+-			"%s: Charging Disabled\n", __func__);
++		// disable log spam
++		//dev_dbg(battery->dev,
++		//	"%s: Charging Disabled\n", __func__);
+ 		return true;
+ 	}
+ 
+@@ -1045,9 +1047,10 @@ static bool sec_bat_get_temperature_by_adc(
+ temp_by_adc_goto:
+ 	value->intval = temp;
+ 
+-	dev_info(battery->dev,
+-		"%s: Temp(%d), Temp-ADC(%d)\n",
+-		__func__, temp, temp_adc);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s: Temp(%d), Temp-ADC(%d)\n",
++	//	__func__, temp, temp_adc);
+ 
+ 	return true;
+ }
+@@ -1099,14 +1102,15 @@ static bool sec_bat_temperature(
+ 			battery->pdata->temp_low_threshold_normal;
+ 	}
+ 
+-	dev_info(battery->dev,
+-		"%s: HLT(%d) HLR(%d) HT(%d), HR(%d), LT(%d), LR(%d)\n",
+-		__func__, battery->temp_highlimit_threshold,
+-		battery->temp_highlimit_recovery,
+-		battery->temp_high_threshold,
+-		battery->temp_high_recovery,
+-		battery->temp_low_threshold,
+-		battery->temp_low_recovery);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s: HLT(%d) HLR(%d) HT(%d), HR(%d), LT(%d), LR(%d)\n",
++	//	__func__, battery->temp_highlimit_threshold,
++	//	battery->temp_highlimit_recovery,
++	//	battery->temp_high_threshold,
++	//	battery->temp_high_recovery,
++	//	battery->temp_low_threshold,
++	//	battery->temp_low_recovery);
+ 	return ret;
+ }
+ 
+@@ -1121,7 +1125,7 @@ static void sec_bat_swelling_check(struct sec_battery_info *battery, int tempera
+ 	psy_do_property(battery->pdata->charger_name, get,
+ 			POWER_SUPPLY_PROP_VOLTAGE_MAX, val);
+ 
+-	pr_info("%s: status(%d), swell_mode(%d:%d:%d), cv(%d)mV, temp(%d)\n",
++	pr_debug("%s: status(%d), swell_mode(%d:%d:%d), cv(%d)mV, temp(%d)\n",
+ 		__func__, battery->status, battery->swelling_mode,
+ 		battery->charging_block, (battery->current_event & SEC_BAT_CURRENT_EVENT_LOW_TEMP),
+ 		val.intval, temperature);
+@@ -1307,8 +1311,9 @@ static bool sec_bat_temperature_check(
+ 	int pre_health;
+ 
+ 	if (battery->status == POWER_SUPPLY_STATUS_DISCHARGING) {
+-		dev_dbg(battery->dev,
+-			"%s: Charging Disabled\n", __func__);
++		// disable log spam
++		//dev_dbg(battery->dev,
++		//	"%s: Charging Disabled\n", __func__);
+ 		return true;
+ 	}
+ 
+@@ -1711,7 +1716,7 @@ static bool sec_bat_time_management(
+ 	get_monotonic_boottime(&ts);
+ 
+ 	if(battery->charging_start_time == 0 || !battery->safety_timer_set) {
+-		pr_info("%s: Charging Disabled\n" ,__func__);
++		pr_debug("%s: Charging Disabled\n" ,__func__);
+ 		return true;
+ 	}
+ 
+@@ -1723,9 +1728,10 @@ static bool sec_bat_time_management(
+ 
+ 	battery->charging_passed_time = charging_time;
+ 
+-	dev_info(battery->dev,
+-		"%s: Charging Time : %ld secs\n", __func__,
+-		battery->charging_passed_time);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s: Charging Time : %ld secs\n", __func__,
++	//	battery->charging_passed_time);
+ 
+ 	switch (battery->status) {
+ 	case POWER_SUPPLY_STATUS_FULL:
+@@ -2083,11 +2089,12 @@ static bool sec_bat_fullcharged_check(
+ 	if (sec_bat_check_fullcharged(battery))
+ 		sec_bat_do_fullcharged(battery);
+ 
+-	dev_info(battery->dev,
+-		"%s: Charging Mode : %s\n", __func__,
+-		battery->is_recharging ?
+-		sec_bat_charging_mode_str[SEC_BATTERY_CHARGING_RECHARGING] :
+-		sec_bat_charging_mode_str[battery->charging_mode]);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s: Charging Mode : %s\n", __func__,
++	//	battery->is_recharging ?
++	//	sec_bat_charging_mode_str[SEC_BATTERY_CHARGING_RECHARGING] :
++	//	sec_bat_charging_mode_str[battery->charging_mode]);
+ 
+ 	return true;
+ }
+@@ -2108,7 +2115,7 @@ static void sec_bat_check_changed_soc(
+ 		if (battery->prev_reported_soc == value->intval) {
+ 			goto report;
+ 		} else {
+-			dev_info(battery->dev, "%s: prev_reported_soc = %d, soc = %d\n",
++			dev_dbg(battery->dev, "%s: prev_reported_soc = %d, soc = %d\n",
+ 					__func__, battery->prev_reported_soc, value->intval);
+ 		}
+ 		/* if soc have been chaged, only change soc by 1
+@@ -2248,7 +2255,7 @@ static void sec_bat_get_battery_info(
+ 	} else if ((battery->capacity != 100) &&
+ 		   ((c_ts.tv_sec - old_ts.tv_sec) >= 30)) {
+ 		battery->capacity++;
+-		pr_info("%s : forced full-charged sequence for the capacity(%d)\n",
++		pr_debug("%s : forced full-charged sequence for the capacity(%d)\n",
+ 			__func__, battery->capacity);
+ 		old_ts = c_ts;
+ 	}
+@@ -2261,19 +2268,20 @@ static void sec_bat_get_battery_info(
+ 	}
+ #endif
+ 
+-	dev_info(battery->dev,
+-		"%s:Vnow(%dmV),Inow(%dmA),Imax(%dmA),SOC(%d%%),Tbat(%d),is_hc_usb(%d)\n",
+-		__func__,
+-		battery->voltage_now, battery->current_now,
+-		battery->current_max, battery->capacity,
+-		battery->temperature, battery->is_hc_usb);
+-	dev_dbg(battery->dev,
+-		"%s,Vavg(%dmV),Vocv(%dmV),Tamb(%d),"
+-		"Iavg(%dmA),Iadc(%d)\n",
+-		battery->present ? "Connected" : "Disconnected",
+-		battery->voltage_avg, battery->voltage_ocv,
+-		battery->temper_amb,
+-		battery->current_avg, battery->current_adc);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s:Vnow(%dmV),Inow(%dmA),Imax(%dmA),SOC(%d%%),Tbat(%d),is_hc_usb(%d)\n",
++	//	__func__,
++	//	battery->voltage_now, battery->current_now,
++	//	battery->current_max, battery->capacity,
++	//	battery->temperature, battery->is_hc_usb);
++	//dev_dbg(battery->dev,
++	//	"%s,Vavg(%dmV),Vocv(%dmV),Tamb(%d),"
++	//	"Iavg(%dmA),Iadc(%d)\n",
++	//	battery->present ? "Connected" : "Disconnected",
++	//	battery->voltage_avg, battery->voltage_ocv,
++	//	battery->temper_amb,
++	//	battery->current_avg, battery->current_adc);
+ }
+ 
+ static void sec_bat_polling_work(struct work_struct *work)
+@@ -2560,8 +2568,9 @@ static void sec_bat_calculate_safety_time(struct sec_battery_info *battery)
+ 		battery->stop_timer = false;
+ 	}
+ 
+-	pr_info("%s : EXPIRED_TIME(%llu), IP(%d), CP(%d), CURR(%d), STANDARD(%d)\n",
+-		__func__, expired_time, input_power, charging_power, curr, battery->pdata->standard_curr);
++	// disable log spam
++	//pr_info("%s : EXPIRED_TIME(%llu), IP(%d), CP(%d), CURR(%d), STANDARD(%d)\n",
++	//	__func__, expired_time, input_power, charging_power, curr, battery->pdata->standard_curr);
+ 
+ 	if (curr == 0)
+ 		return;
+@@ -2569,7 +2578,8 @@ static void sec_bat_calculate_safety_time(struct sec_battery_info *battery)
+ 	expired_time *= battery->pdata->standard_curr;
+ 	do_div(expired_time, curr);
+ 
+-	pr_info("%s : CAL_EXPIRED_TIME(%llu) TIME NOW(%ld) TIME PREV(%ld)\n", __func__, expired_time, ts.tv_sec, battery->prev_safety_time);
++	// disable log spam
++	// pr_info("%s : CAL_EXPIRED_TIME(%llu) TIME NOW(%ld) TIME PREV(%ld)\n", __func__, expired_time, ts.tv_sec, battery->prev_safety_time);
+ 
+ 	if (expired_time <= ((ts.tv_sec - battery->prev_safety_time) * 1000))
+ 		expired_time = 0;
+@@ -2582,7 +2592,8 @@ static void sec_bat_calculate_safety_time(struct sec_battery_info *battery)
+ 
+ 	battery->expired_time = expired_time;
+ 	battery->prev_safety_time = ts.tv_sec;
+-	pr_info("%s : REMAIN_TIME(%ld) CAL_REMAIN_TIME(%ld)\n", __func__, battery->expired_time, battery->cal_safety_time);
++	// disable log spam
++	// pr_info("%s : REMAIN_TIME(%ld) CAL_REMAIN_TIME(%ld)\n", __func__, battery->expired_time, battery->cal_safety_time);
+ }
+ 
+ static void sec_bat_monitor_work(
+@@ -2672,13 +2683,14 @@ continue_monitor:
+ 	if (!battery->charging_block)
+ 		sec_bat_calculate_safety_time(battery);
+ 
+-	dev_info(battery->dev,
+-		"%s: Status(%s), Mode(%s), Health(%s), Cable(%d), Vendor(%s), level(%d%%)\n",
+-		__func__,
+-		sec_bat_status_str[battery->status],
+-		sec_bat_charging_mode_str[battery->charging_mode],
+-		sec_bat_health_str[battery->health],
+-		battery->cable_type, battery->pdata->vendor, battery->siop_level);
++	// disable log spam
++	//dev_info(battery->dev,
++	//	"%s: Status(%s), Mode(%s), Health(%s), Cable(%d), Vendor(%s), level(%d%%)\n",
++	//	__func__,
++	//	sec_bat_status_str[battery->status],
++	//	sec_bat_charging_mode_str[battery->charging_mode],
++	//	sec_bat_health_str[battery->health],
++	//	battery->cable_type, battery->pdata->vendor, battery->siop_level);
+ #if defined(CONFIG_SAMSUNG_BATTERY_ENG_TEST)
+ 	dev_info(battery->dev,
+ 			"%s: battery->stability_test(%d), battery->eng_not_full_status(%d)\n",
+@@ -2686,9 +2698,10 @@ continue_monitor:
+ #endif
+ 	if (battery->store_mode && battery->cable_type != POWER_SUPPLY_TYPE_BATTERY) {
+ 
+-		dev_info(battery->dev,
+-			"%s: @battery->capacity = (%d), battery->status= (%d), battery->store_mode=(%d)\n",
+-			__func__, battery->capacity, battery->status, battery->store_mode);
++		// disable log spam
++		//dev_info(battery->dev,
++		//	"%s: @battery->capacity = (%d), battery->status= (%d), battery->store_mode=(%d)\n",
++		//	__func__, battery->capacity, battery->status, battery->store_mode);
+ 
+ 		if ((battery->capacity >= 35) && (battery->status == POWER_SUPPLY_STATUS_CHARGING)) {
+ 			sec_bat_set_charging_status(battery,
+@@ -3965,7 +3978,7 @@ static int sec_bat_get_property(struct power_supply *psy,
+ 			if (battery->status == POWER_SUPPLY_STATUS_FULL &&
+ 				battery->capacity != 100) {
+ 				val->intval = POWER_SUPPLY_STATUS_CHARGING;
+-				pr_info("%s: forced full-charged sequence progressing\n", __func__);
++				pr_debug("%s: forced full-charged sequence progressing\n", __func__);
+ 			} else
+ #endif
+ 				val->intval = battery->status;
+diff --git a/drivers/battery/sec_fuelgauge.c b/drivers/battery/sec_fuelgauge.c
+index 262ad7be6cd..b6bf041b7d7 100644
+--- a/drivers/battery/sec_fuelgauge.c
++++ b/drivers/battery/sec_fuelgauge.c
+@@ -45,9 +45,10 @@ static void sec_fg_get_scaled_capacity(
+ 		0 : ((val->intval - fuelgauge->pdata->capacity_min) * 1000 /
+ 		(fuelgauge->capacity_max - fuelgauge->pdata->capacity_min));
+ 
+-	dev_info(&fuelgauge->client->dev,
+-		"%s: scaled capacity (%d.%d)\n",
+-		__func__, val->intval/10, val->intval%10);
++	// disable log spam
++	//dev_info(&fuelgauge->client->dev,
++	//	"%s: scaled capacity (%d.%d)\n",
++	//	__func__, val->intval/10, val->intval%10);
+ 
+ #if defined(CONFIG_MACH_KLIMT)|| defined(CONFIG_MACH_CHAGALL)
+ 	/* Reduce soc jump when battery is full
+diff --git a/drivers/fingerprint/fingerprint.h b/drivers/fingerprint/fingerprint.h
+index b15971924b2..38c9f143e64 100644
+--- a/drivers/fingerprint/fingerprint.h
++++ b/drivers/fingerprint/fingerprint.h
+@@ -33,9 +33,10 @@ enum {
+ 	SENSOR_EGIS,
+ };
+ 
+-#define SENSOR_STATUS_SIZE 5
+-static char sensor_status[SENSOR_STATUS_SIZE][8] ={"unknown", "failed",
+-	"viper", "raptor", "egis"};
++// this is now unused, because of commented code in vfs61xx.c: vfsspi_work_func_debug()
++// #define SENSOR_STATUS_SIZE 5
++// static char sensor_status[SENSOR_STATUS_SIZE][8] = {"unknown", "failed",
++//	"viper", "raptor", "egis"};
+ 
+ /* Fingerprint vendor check */
+ #undef ENABLE_VENDOR_CHECK
+diff --git a/drivers/fingerprint/vfs61xx.c b/drivers/fingerprint/vfs61xx.c
+index 7cdf0e2c0d3..1fab64d7624 100644
+--- a/drivers/fingerprint/vfs61xx.c
++++ b/drivers/fingerprint/vfs61xx.c
+@@ -1548,20 +1548,21 @@ static void vfsspi_work_func_debug(struct work_struct *work)
+ 					| gpio_get_value(g_data->ldo_pin);
+ 	}
+ 
+-	if (g_data->ocp_en)
+-		pr_info("%s r ocpen: %d, ldo: %d,"
+-			" sleep: %d, tz: %d, type: %s\n",
+-			__func__, gpio_get_value(g_data->ocp_en),
+-			ldo_value, gpio_get_value(g_data->sleepPin),
+-			g_data->tz_mode,
+-			sensor_status[g_data->sensortype+1]);
+-	else
+-		pr_info("%s r ldo: %d,"
+-			" sleep: %d, tz: %d, type: %s\n",
+-			__func__, ldo_value,
+-			gpio_get_value(g_data->sleepPin),
+-			g_data->tz_mode,
+-			sensor_status[g_data->sensortype+1]);
++	// disable log spam
++	//if (g_data->ocp_en)
++	//	pr_info("%s r ocpen: %d, ldo: %d,"
++	//		" sleep: %d, tz: %d, type: %s\n",
++	//		__func__, gpio_get_value(g_data->ocp_en),
++	//		ldo_value, gpio_get_value(g_data->sleepPin),
++	//		g_data->tz_mode,
++	//		sensor_status[g_data->sensortype+1]);
++	//else
++	//	pr_info("%s r ldo: %d,"
++	//		" sleep: %d, tz: %d, type: %s\n",
++	//		__func__, ldo_value,
++	//		gpio_get_value(g_data->sleepPin),
++	//		g_data->tz_mode,
++	//		sensor_status[g_data->sensortype+1]);
+ }
+ 
+ static void vfsspi_enable_debug_timer(void)
+diff --git a/drivers/input/touchscreen/synaptics/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics/synaptics_i2c_rmi.c
+index 8816236f40b..afba3a709ce 100644
+--- a/drivers/input/touchscreen/synaptics/synaptics_i2c_rmi.c
++++ b/drivers/input/touchscreen/synaptics/synaptics_i2c_rmi.c
+@@ -1746,7 +1746,7 @@ static int synaptics_rmi4_f12_abs_report(struct synaptics_rmi4_data *rmi4_data,
+ #endif
+ 
+ 			if (!rmi4_data->finger[finger].state) {
+-#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
++/*#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
+ 				dev_info(&rmi4_data->i2c_client->dev,
+ 						"[%d][P] 0x%02x, x = %d, y = %d, wx = %d, wy = %d |[%d]\n",
+ 						finger, finger_status, x, y, wx, wy, fingers_to_process);
+@@ -1754,22 +1754,22 @@ static int synaptics_rmi4_f12_abs_report(struct synaptics_rmi4_data *rmi4_data,
+ 				dev_info(&rmi4_data->i2c_client->dev,
+ 						"[%d][P] 0x%02x\n",
+ 						finger, finger_status);
+-#endif
++#endif*/
+ 			} else {
+ 				rmi4_data->finger[finger].mcount++;
+ 			}
+ 
+-#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
++/*#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
+ 			if (rmi4_data->debug_log & 0x2)
+ 				dev_info(&rmi4_data->i2c_client->dev,
+ 						"[%d] 0x%02x, x = %d, y = %d, wx = %d, wy = %d |[%d]\n",
+ 						finger, finger_status, x, y, wx, wy, fingers_to_process);
+-#endif
++#endif*/
+ 			touch_count++;
+ 		}
+ 
+ 		if (rmi4_data->finger[finger].state && (!finger_status)) {
+-#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
++/*#if !defined(CONFIG_SAMSUNG_PRODUCT_SHIP)
+ 			dev_info(&rmi4_data->i2c_client->dev, "[%d][R] 0x%02x M[%d], Ver[%02X%02X][%X/%d]\n",
+ 					finger, finger_status, rmi4_data->finger[finger].mcount,
+ 					rmi4_data->ic_revision_of_ic, rmi4_data->fw_version_of_ic, rmi4_data->lcd_id, system_rev);
+@@ -1777,7 +1777,7 @@ static int synaptics_rmi4_f12_abs_report(struct synaptics_rmi4_data *rmi4_data,
+ 			dev_info(&rmi4_data->i2c_client->dev, "[%d][R] 0x%02x M[%d], Ver[%02X%02X][%X/%d]\n",
+ 					finger, finger_status, rmi4_data->finger[finger].mcount,
+ 					rmi4_data->ic_revision_of_ic, rmi4_data->fw_version_of_ic, rmi4_data->lcd_id, system_rev);
+-#endif
++#endif*/
+ 			rmi4_data->finger[finger].mcount = 0;
+ 		}
+ 
+diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c
+index 03c7eda5811..6e18c83bd71 100644
+--- a/drivers/thermal/msm_thermal.c
++++ b/drivers/thermal/msm_thermal.c
+@@ -53,7 +53,7 @@
+ 
+ static struct msm_thermal_data msm_thermal_info;
+ static struct delayed_work check_temp_work;
+-static struct delayed_work temp_log_work;
++// static struct delayed_work temp_log_work;
+ static bool core_control_enabled;
+ static uint32_t cpus_offlined;
+ static DEFINE_MUTEX(core_control_mutex);
+@@ -1385,30 +1385,30 @@ reschedule:
+ }
+ 
+ 
+-static void __ref msm_therm_temp_log(struct work_struct *work)
+-{
+-
+-	struct tsens_device tsens_dev;
+-	long temp =  0;
+-	int i, added = 0, ret = 0;
+-	uint32_t max_sensors = 0;
+-	char buffer[500];
+-
+-	if(!tsens_get_max_sensor_num(&max_sensors))
+-	{
+-		pr_info( "Debug Temp for Sensor: ");
+-		for(i=0;i<max_sensors;i++)
+-		{
+-			tsens_dev.sensor_num = i;
+-			tsens_get_temp(&tsens_dev, &temp);
+-			ret = sprintf(buffer + added, "(%d --- %ld)", i, temp);
+-			added += ret;						
+-		}
+-		pr_info("%s", buffer);
+-	}
+-	schedule_delayed_work(&temp_log_work,
+-				HZ*5); //For every 5 seconds log the temperature values of all the msm thermistors.
+-}
++//static void __ref msm_therm_temp_log(struct work_struct *work)
++//{
++//
++//	struct tsens_device tsens_dev;
++//	long temp =  0;
++//	int i, added = 0, ret = 0;
++//	uint32_t max_sensors = 0;
++//	char buffer[500];
++
++//	if(!tsens_get_max_sensor_num(&max_sensors))
++//	{
++//		pr_info( "Debug Temp for Sensor: ");
++//		for(i=0;i<max_sensors;i++)
++//		{
++//			tsens_dev.sensor_num = i;
++//			tsens_get_temp(&tsens_dev, &temp);
++//			ret = sprintf(buffer + added, "(%d --- %ld)", i, temp);
++//			added += ret;
++//		}
++//		pr_info("%s", buffer);
++//	}
++//	schedule_delayed_work(&temp_log_work,
++//				HZ*5); //For every 5 seconds log the temperature values of all the msm thermistors.
++//}
+ 
+ static int __ref msm_thermal_cpu_callback(struct notifier_block *nfb,
+ 		unsigned long action, void *hcpu)
+@@ -3363,7 +3363,7 @@ static int msm_thermal_dev_exit(struct platform_device *inp_dev)
+ 		kfree(thresh);
+ 		thresh = NULL;
+ 	}
+-	cancel_delayed_work_sync(&temp_log_work);
++	// cancel_delayed_work_sync(&temp_log_work);
+ 	return 0;
+ }
+ 
+@@ -3384,8 +3384,8 @@ static struct platform_driver msm_thermal_device_driver = {
+ 
+ int __init msm_thermal_device_init(void)
+ {
+-	INIT_DELAYED_WORK(&temp_log_work, msm_therm_temp_log);
+-	schedule_delayed_work(&temp_log_work, HZ*2);
++	// INIT_DELAYED_WORK(&temp_log_work, msm_therm_temp_log);
++	// schedule_delayed_work(&temp_log_work, HZ*2);
+ 
+ 	return platform_driver_register(&msm_thermal_device_driver);
+ }
+-- 
+2.19.1
+
diff --git a/device/linux-samsung-klte/03_msm_fix_trace.patch b/device/linux-samsung-klte/03_msm_fix_trace.patch
deleted file mode 100644
index 8d25e8536..000000000
--- a/device/linux-samsung-klte/03_msm_fix_trace.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/video/msm/mdss/mdss_mdp_trace.h b/drivers/video/msm/mdss/mdss_mdp_trace.h
-index 33fe3a4..730b7ff 100644
---- a/drivers/video/msm/mdss/mdss_mdp_trace.h
-+++ b/drivers/video/msm/mdss/mdss_mdp_trace.h
-@@ -17,7 +17,7 @@
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM mdss
- #undef TRACE_INCLUDE_PATH
--#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/video/msm/mdss
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE mdss_mdp_trace
- 
diff --git a/device/linux-samsung-klte/APKBUILD b/device/linux-samsung-klte/APKBUILD
index 97ae88045..a3891a89a 100644
--- a/device/linux-samsung-klte/APKBUILD
+++ b/device/linux-samsung-klte/APKBUILD
@@ -1,20 +1,21 @@
-# Kernel config based on: arch/arm/configs/boeffla_defconfig
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm/configs/msm8974_sec_defconfig
+#                         arch/arm/configs/msm8974pro_sec_klte_eur_defconfig
+#                         arch/arm/configs/selinux_defconfig
 
 pkgname="linux-samsung-klte"
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.113
+pkgrel=0
 pkgdesc="Samsung Galaxy S5 kernel fork"
 arch="armhf"
 _carch="arm"
 _flavor="samsung-klte"
-url="https://github.com/andip71/boeffla-kernel-samsung-s5"
-license="GPL2"
+url="https://kernel.org"
+license="GPL-2.0-only"
 options="!strip !check !tracedeps"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz dtbtool gcc6"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz dtbtool devicepkg-dev gcc6"
 
-# Compiler: this kernel was only tested with GCC6. Feel free to make a merge
-# request if you find out that it is booting working with newer GCCs as
-# well. See <https://postmarketos.org/vendorkernel> for instructions.
+# Compiler: GCC 6 (doesn't boot when compiled with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
 	HOSTCC="gcc6-gcc"
@@ -22,41 +23,26 @@ if [ "${CC:0:5}" != "gcc6-" ]; then
 fi
 
 # Source
-_repository="boeffla-kernel-samsung-s5"
-_commit="4f0aa338c54103b7d7744dd3a8202081883512b5"
+_repository="android_kernel_samsung_msm8974"
+_commit="7a3b6080ee8d411acc2bb4a08de479aa8cc9c77a"
 _config="config-${_flavor}.${arch}"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/andip71/${_repository}/archive/${_commit}.tar.gz
+	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/${_repository}/archive/${_commit}.tar.gz
 	$_config
-	compiler-gcc6.h
 	00_fix_return_address.patch
-	01_timeconst_fix.patch
-	02_gpu-msm-fix-gcc5-compile.patch
-	03_msm_fix_trace.patch
+	01_gpu-msm-fix-gcc5-compile.patch
+	02-Reduce-battery-and-touchscreen-log-spam.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
 prepare() {
 	default_prepare
-
-	# gcc6 support
-	cp -v "$srcdir/compiler-gcc6.h" "$builddir/include/linux/"
-
-	# Remove -Werror from all makefiles
-	find . -type f -name Makefile -print0 | \
-		xargs -0 sed -i 's/-Werror-/-W/g'
-	find . -type f -name Makefile -print0 | \
-		xargs -0 sed -i 's/-Werror//g'
-
-	# Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
-	cp "$srcdir"/$_config "$builddir"/.config
-	yes "" | make ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig
+	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
 }
 
 build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		C_INCLUDE_PATH="./arch/arm/mach-msm:./sound/soc/msm/qdsp6v2"
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 
 	# Generate master DTB
@@ -85,12 +71,16 @@ package() {
 	# Master DTB
 	install -Dm644 "$builddir/arch/arm/boot/dt.img" \
 		"$pkgdir/boot/dt.img"
+
+	# External modules install
+	cd "$builddir"
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
+		INSTALL_MOD_PATH="$pkgdir" modules_install
 }
 
-sha512sums="c4bee8ae1f9a6d3126c54395e5640ec7d2750b82cb83c515d132a2fa769667d9795d5cff8ae9bf41118d61d4311dbba50328f31804bee901f5cd6ff899d2040b  linux-samsung-klte-4f0aa338c54103b7d7744dd3a8202081883512b5.tar.gz
-dbd294dccaaf1d94b8cb235ad54e9f72af1a0e7e31184c25e4b24685419d01f4420dd6e4af5080b47d12f719531cee97e037e305e7eb7371980d8c90d67b60c0  config-samsung-klte.armhf
-d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
-a2bb98fb8d988bbb659cae00fbaca360828300e9b98b90aed5ee0dd839c3f740696df4094a9021b813cbada06820d115aabed581a47cdd2c947e8d853c20b145  01_timeconst_fix.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-657630a1ebd5a9aff872530022e83b1087ef3c0eb7a214d350c9caf779c2691f92de6630a40d735b5f7a34ba6a3e9e7eb708d3deb52f134d53164836c312e5e9  03_msm_fix_trace.patch"
+sha512sums="a0ed01d4beb4fd1b304ea1409e4e3d7ff60662de34999dcdb2901cb10eef217a6679d5cc42dfcc9c3e2b9fb96bc38a8adc431444092310e22af29c7d581f60af  linux-samsung-klte-7a3b6080ee8d411acc2bb4a08de479aa8cc9c77a.tar.gz
+3045e613475bcdb454315450c86ca3198787ff0f4573a61118a6a600048d1d9b45d6c83c1804d4945bcf24af8759a038d9f2b5bf57aa7ab8b3585be65ffd4f7a  config-samsung-klte.armhf
+3b4913415bcfe0ff222969f993890c656c7e12b6ee06532bded485d5201c9855b2c87996c5b63423702b89b6b0ca214b5aceeb402571d9c5af084093c157ccb4  00_fix_return_address.patch
+0fc4b1782dfd3bd94fa9ae8ab74b19713f25e9f4a48dcf830072634f247aa3dd8847f001a3e87e9728e057657efd4ae751510e7c408d9b960c907665ca64e61f  01_gpu-msm-fix-gcc5-compile.patch
+b55fc9ab3e21bc85d66ee08d7e1cd7fdc3b236249212fbcd0055e60ed3e6cef3e4d2b8058a4b7d70c78b2bbc7a11111b55d4d82490b4e3579b8e61657806ac09  02-Reduce-battery-and-touchscreen-log-spam.patch"
diff --git a/device/linux-samsung-klte/config-samsung-klte.armhf b/device/linux-samsung-klte/config-samsung-klte.armhf
index 1971ea55e..565ba3bfa 100644
--- a/device/linux-samsung-klte/config-samsung-klte.armhf
+++ b/device/linux-samsung-klte/config-samsung-klte.armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.0 Kernel Configuration
+# Linux/arm 3.4.113 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -56,9 +56,10 @@ CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_FHANDLE is not set
+CONFIG_FHANDLE=y
 # CONFIG_TASKSTATS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
@@ -91,28 +92,35 @@ CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
-# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
+CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
-# CONFIG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -122,6 +130,7 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -176,6 +185,12 @@ CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 
 #
 # GCOV-based kernel profiling
@@ -185,10 +200,9 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
@@ -196,6 +210,7 @@ CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
 
 #
 # Partition Types
@@ -228,21 +243,14 @@ CONFIG_IOSCHED_TEST=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_ROW=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_SIO=y
-CONFIG_IOSCHED_FIOPS=y
+# CONFIG_CFQ_GROUP_IOSCHED is not set
 CONFIG_IOSCHED_BFQ=y
 CONFIG_CGROUP_BFQIO=y
-CONFIG_IOSCHED_ZEN=y
-CONFIG_IOSCHED_TRIPNDROID=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_ROW is not set
 CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_SIO is not set
-# CONFIG_DEFAULT_FIOPS is not set
 # CONFIG_DEFAULT_BFQ is not set
-# CONFIG_DEFAULT_ZEN is not set
-# CONFIG_DEFAULT_TRIPNDROID is not set
+# CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
 # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -582,6 +590,7 @@ CONFIG_USER_RESET_DEBUG=y
 # CONFIG_MACH_KLIMT is not set
 # CONFIG_MACH_KLIMT_LTE is not set
 # CONFIG_MACH_KLIMT_VZW is not set
+# CONFIG_MACH_KLIMT_LTE_DCM is not set
 # CONFIG_SEC_PICASSO_PROJECT is not set
 # CONFIG_MACH_PICASSO is not set
 # CONFIG_MACH_PICASSO_LTE is not set
@@ -622,6 +631,7 @@ CONFIG_USER_RESET_DEBUG=y
 # CONFIG_MACH_KACTIVELTE_ATT is not set
 # CONFIG_MACH_KACTIVELTE_CAN is not set
 # CONFIG_MACH_KACTIVELTE_SKT is not set
+# CONFIG_MACH_KACTIVELTE_KOR is not set
 # CONFIG_MACH_KACTIVELTE_DCM is not set
 # CONFIG_SEC_KSPORTS_PROJECT is not set
 # CONFIG_MACH_KSPORTSLTE_SPR is not set
@@ -685,18 +695,15 @@ CONFIG_MSM_IPC_ROUTER_SECURITY=y
 CONFIG_MSM_QMI_INTERFACE=y
 # CONFIG_MSM_TEST_QMI_CLIENT is not set
 # CONFIG_MSM_DALRPC is not set
-CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y
-CONFIG_MSM_CPU_FREQ_MAX=2457600
-CONFIG_MSM_CPU_FREQ_MIN=300000
+# CONFIG_MSM_CPU_FREQ_SET_MIN_MAX is not set
 CONFIG_MSM_DEVFREQ_CPUBW=y
-CONFIG_CPU_VOLTAGE_TABLE=y
 # CONFIG_MSM_AVS_HW is not set
 # CONFIG_MSM_HW3D is not set
 CONFIG_AMSS_7X25_VERSION_2009=y
 # CONFIG_AMSS_7X25_VERSION_2008 is not set
 CONFIG_RTAC=y
 # CONFIG_MSM_VREG_SWITCH_INVERTED is not set
-CONFIG_MSM_DMA_TEST=y
+# CONFIG_MSM_DMA_TEST is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_WIFI_MEM_PREALLOC is not set
 CONFIG_SURF_FFA_GPIO_KEYPAD=y
@@ -763,7 +770,7 @@ CONFIG_MSM_QDSP6V2_CODECS=y
 CONFIG_MSM_AUDIO_QDSP6V2=y
 CONFIG_MSM_ADSP_LOADER=y
 # CONFIG_MSM_ULTRASOUND_A is not set
-CONFIG_MSM_ULTRASOUND_B=y
+# CONFIG_MSM_ULTRASOUND_B is not set
 # CONFIG_MSM_SPM_V1 is not set
 CONFIG_MSM_SPM_V2=y
 CONFIG_MSM_L2_SPM=y
@@ -778,6 +785,7 @@ CONFIG_MSM_OCMEM_DEBUG=y
 # CONFIG_SENSORS_ADSP is not set
 CONFIG_MSM_RTB=y
 CONFIG_MSM_RTB_SEPARATE_CPUS=y
+# CONFIG_MSM_RTB_TIMESTAMP is not set
 # CONFIG_MSM_EBI_ERP is not set
 CONFIG_MSM_CACHE_ERP=y
 CONFIG_MSM_L1_ERR_PANIC=y
@@ -805,19 +813,15 @@ CONFIG_MSM_BOOT_STATS=y
 # CONFIG_MSM_CPR_REGULATOR is not set
 # CONFIG_I2C_ACTUATOR is not set
 # CONFIG_SWITCH_DUAL_MODEM is not set
-# CONFIG_TIMA_RKP is not set
 # CONFIG_TIMA is not set
-CONFIG_TIMA_LKMAUTH=y
-# CONFIG_TIMA_LKMAUTH_CODE_PROT is not set
-# CONFIG_TIMA_TEST_INFRA is not set
 # CONFIG_PCM_ROUTE_VOICE_STUB is not set
 CONFIG_BT_CALL_FORWARDING=y
 CONFIG_KRAIT_REGULATOR=y
 # CONFIG_EXTEND_SERIAL_NUM_16 is not set
 # CONFIG_MUIC_RESET_PIN_ENABLE is not set
+# CONFIG_TERT_MI2S_ENABLE is not set
 CONFIG_SEC_SMART_MGR_RUNQUEUE_AVG=y
-CONFIG_PVS_LEVEL_INTERFACE=y
-CONFIG_CHARGE_LEVEL=y
+# CONFIG_KERNEL_TEXT_MPU_PROT is not set
 
 #
 # System MMU
@@ -872,6 +876,7 @@ CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_ARM_ERRATA_754327=y
 # CONFIG_ARM_ERRATA_764369 is not set
 # CONFIG_KSAPI is not set
+# CONFIG_ARM_ERRATA_775420 is not set
 CONFIG_ARM_GIC=y
 # CONFIG_FIQ_DEBUGGER is not set
 
@@ -897,6 +902,7 @@ CONFIG_SCHED_MC=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_ARM_ARCH_TIMER=y
+# CONFIG_ARM_ARCH_TIMER_VCT_ACCESS is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
@@ -909,7 +915,12 @@ CONFIG_ARCH_NR_GPIO=0
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
-CONFIG_HZ=100
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -935,21 +946,15 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-CONFIG_FRONTSWAP=y
-CONFIG_ZSMALLOC_NEW=y
-CONFIG_PGTABLE_MAPPING=y
-CONFIG_ZSWAP=y
-# CONFIG_SWAP_ENABLE_READAHEAD is not set
-# CONFIG_ZSWAP_ENABLE_WRITEBACK is not set
-CONFIG_DIRECT_RECLAIM_FILE_PAGES_ONLY=y
-CONFIG_INCREASE_MAXIMUM_SWAPPINESS=y
-CONFIG_FIX_INACTIVE_RATIO=y
-CONFIG_TIGHT_PGDAT_BALANCE=y
+CONFIG_CLEANCACHE=y
+# CONFIG_FRONTSWAP is not set
+CONFIG_SWAP_ENABLE_READAHEAD=y
 CONFIG_MEMORY_HOLE_CARVEOUT=y
 # CONFIG_USE_USER_ACCESSIBLE_TIMERS is not set
 CONFIG_MIN_DIRTY_THRESH_PAGES=2560
-# CONFIG_SDP_CACHE_CLEANUP is not set
+CONFIG_ZBUD=y
+CONFIG_ZCACHE=y
+CONFIG_ZSMALLOC=y
 # CONFIG_ARCH_MEMORY_PROBE is not set
 # CONFIG_ARCH_MEMORY_REMOVE is not set
 # CONFIG_ENABLE_DMM is not set
@@ -959,7 +964,7 @@ CONFIG_ENABLE_VMALLOC_SAVING=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
@@ -998,42 +1003,14 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SLIM is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ZZMOOVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIACTIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_WHEATLEY is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTMAX is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTMAX_EPS is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTELLIMM is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_LIONHEART is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_NIGHTMARE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PEGASUSQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_IMPULSE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMANDPLUS is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_YANKACTIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_SLIM=y
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ZZMOOVE=y
-CONFIG_CPU_FREQ_GOV_INTELLIDEMAND=y
-CONFIG_CPU_FREQ_GOV_INTELLIACTIVE=y
-CONFIG_CPU_FREQ_GOV_WHEATLEY=y
-CONFIG_CPU_FREQ_GOV_SMARTMAX=y
-CONFIG_CPU_FREQ_GOV_SMARTMAX_EPS=y
-CONFIG_CPU_FREQ_GOV_INTELLIMM=y
-CONFIG_CPU_FREQ_GOV_LIONHEART=y
-CONFIG_CPU_FREQ_GOV_NIGHTMARE=y
-CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
-CONFIG_CPU_FREQ_GOV_IMPULSE=y
-CONFIG_CPU_FREQ_GOV_ONDEMANDPLUS=y
-CONFIG_CPU_FREQ_GOV_YANKACTIVE=y
 
 #
 # ARM CPU frequency scaling drivers
@@ -1057,6 +1034,7 @@ CONFIG_CPU_FREQ_MSM=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 
 #
 # Userspace binary formats
@@ -1064,8 +1042,7 @@ CONFIG_NEON=y
 CONFIG_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 
 #
@@ -1074,6 +1051,8 @@ CONFIG_HAVE_AOUT=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_CPU_FREQ_LIMIT_USERSPACE=y
+CONFIG_HAS_WAKELOCK=y
+CONFIG_WAKELOCK=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -1096,7 +1075,7 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_UNIX=y
-# CONFIG_UNIX_DIAG is not set
+CONFIG_UNIX_DIAG=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -1132,28 +1111,11 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_UDP_DIAG is not set
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
+CONFIG_INET_UDP_DIAG=y
+# CONFIG_INET_DIAG_DESTROY is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=y
-CONFIG_TCP_CONG_HTCP=y
-CONFIG_TCP_CONG_HSTCP=y
-# CONFIG_TCP_CONG_HYBLA is not set
-CONFIG_TCP_CONG_VEGAS=y
-CONFIG_TCP_CONG_SCALABLE=y
-CONFIG_TCP_CONG_LP=y
-CONFIG_TCP_CONG_VENO=y
-CONFIG_TCP_CONG_YEAH=y
-CONFIG_TCP_CONG_ILLINOIS=y
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_VENO is not set
-CONFIG_DEFAULT_WESTWOOD=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
@@ -1191,7 +1153,7 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_NETLINK=y
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
+CONFIG_NETFILTER_NETLINK_ACCT=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
@@ -1226,12 +1188,13 @@ CONFIG_NETFILTER_XTABLES=y
 #
 CONFIG_NETFILTER_XT_MARK=y
 CONFIG_NETFILTER_XT_CONNMARK=y
+# CONFIG_NETFILTER_XT_SET is not set
 
 #
 # Xtables targets
 #
 # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
@@ -1242,7 +1205,7 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 # CONFIG_NETFILTER_XT_TARGET_LED is not set
 CONFIG_NETFILTER_XT_TARGET_LOG=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
@@ -1278,7 +1241,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+CONFIG_NETFILTER_XT_MATCH_NFACCT=y
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
@@ -1299,9 +1262,23 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
 CONFIG_NETFILTER_XT_MATCH_TIME=y
 CONFIG_NETFILTER_XT_MATCH_U32=y
-# CONFIG_IP_SET is not set
+CONFIG_IP_SET=y
+CONFIG_IP_SET_MAX=256
+# CONFIG_IP_SET_BITMAP_IP is not set
+# CONFIG_IP_SET_BITMAP_IPMAC is not set
+# CONFIG_IP_SET_BITMAP_PORT is not set
+# CONFIG_IP_SET_HASH_IP is not set
+# CONFIG_IP_SET_HASH_IPPORT is not set
+# CONFIG_IP_SET_HASH_IPPORTIP is not set
+# CONFIG_IP_SET_HASH_IPPORTNET is not set
+# CONFIG_IP_SET_HASH_NET is not set
+# CONFIG_IP_SET_HASH_NETPORT is not set
+# CONFIG_IP_SET_HASH_NETIFACE is not set
+# CONFIG_IP_SET_LIST_SET is not set
 # CONFIG_IP_VS is not set
-# CONFIG_VPNCLIENT_SECURITY is not set
+CONFIG_VPNCLIENT_SECURITY=y
+CONFIG_VPNCLIENT_PROC_UID=1000
+CONFIG_VPNCLIENT_PROC_GID=1000
 
 #
 # IP: Netfilter Configuration
@@ -1313,7 +1290,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
+CONFIG_IP_NF_MATCH_RPFILTER=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
@@ -1358,9 +1335,9 @@ CONFIG_IP6_NF_IPTABLES=y
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
 # CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+CONFIG_IP6_NF_MATCH_RPFILTER=y
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_FILTER=y
@@ -1401,7 +1378,8 @@ CONFIG_STP=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=y
 # CONFIG_LLC2 is not set
@@ -1435,14 +1413,14 @@ CONFIG_NET_SCH_PRIO=y
 # CONFIG_NET_SCH_MQPRIO is not set
 # CONFIG_NET_SCH_CHOKE is not set
 # CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_INGRESS is not set
+CONFIG_NET_SCH_INGRESS=y
 # CONFIG_NET_SCH_PLUG is not set
 
 #
 # Classification
 #
 CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_ROUTE4 is not set
 CONFIG_NET_CLS_FW=y
@@ -1452,7 +1430,7 @@ CONFIG_CLS_U32_MARK=y
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_RSVP6 is not set
 CONFIG_NET_CLS_FLOW=y
-# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=y
@@ -1463,7 +1441,7 @@ CONFIG_NET_EMATCH_TEXT=y
 CONFIG_NET_CLS_ACT=y
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_MIRRED is not set
+CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
@@ -1473,7 +1451,7 @@ CONFIG_NET_CLS_ACT=y
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
+# CONFIG_DNS_RESOLVER is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 CONFIG_RPS=y
@@ -1494,7 +1472,8 @@ CONFIG_HAVE_BPF_JIT=y
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=y
-# CONFIG_BT_RFCOMM is not set
+CONFIG_BT_RFCOMM=y
+# CONFIG_BT_RFCOMM_TTY is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=y
 
@@ -1504,7 +1483,12 @@ CONFIG_BT_HIDP=y
 # CONFIG_BT_HCISMD is not set
 # CONFIG_BT_HCIBTUSB is not set
 # CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_LL is not set
+# CONFIG_BT_HCIUART_IBS is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_MSM_SLEEP is not set
@@ -1552,7 +1536,7 @@ CONFIG_RFKILL_LEDS=y
 #
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -1575,11 +1559,12 @@ CONFIG_SW_SYNC=y
 CONFIG_CMA=y
 # CONFIG_CMA_PAGE_COUNTING is not set
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_PINPAGE_MIGRATION=y
 
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set
@@ -1629,6 +1614,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y
+# CONFIG_ZRAM_DEBUG is not set
 
 #
 # Misc devices
@@ -1651,6 +1639,8 @@ CONFIG_MUIC_MAX77804K_SUPPORT_MHL_CABLE_DETECTION=y
 # CONFIG_SENSORS_BH1770 is not set
 # CONFIG_SENSORS_APDS990X is not set
 CONFIG_SAMSUNG_JACK=y
+# CONFIG_SAMSUNG_JACK_VOICE_BTN is not set
+# CONFIG_SAMSUNG_JACK_READ_BTN_ADC is not set
 # CONFIG_EARJACK_ADC_SYSFS is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
@@ -1663,7 +1653,7 @@ CONFIG_UID_STAT=y
 # CONFIG_SM5502_MUIC is not set
 # CONFIG_SM5504_MUIC is not set
 # CONFIG_USB_SWITCH_TSU6721 is not set
-CONFIG_MUIC_SUPPORT_RUSTPROOF=y
+# CONFIG_MUIC_SUPPORT_RUSTPROOF is not set
 CONFIG_MAX77804K_MUIC=y
 # CONFIG_USB_SWITCH_FSA9485 is not set
 # CONFIG_MUIC_FSA9485_SUPPORT_CAR_DOCK is not set
@@ -1685,6 +1675,7 @@ CONFIG_NFC_PN547_PMC8974_CLK_REQ=y
 # CONFIG_NFC_N5_PMC8974_CLK_REQ is not set
 # CONFIG_NFC_I2C_OVERWRITE is not set
 CONFIG_TI_DRV2667=y
+CONFIG_UID_CPUTIME=y
 # CONFIG_RT8973_JIG_WAKEUP is not set
 # CONFIG_MUIC_DET_JACK is not set
 # CONFIG_SGLTE_QSC_MODEM is not set
@@ -1714,6 +1705,11 @@ CONFIG_TI_DRV2667=y
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_SEC_MODEM is not set
 
+#
+# Altera FPGA firmware download module
+#
+CONFIG_DUALWAVE=y
+
 #
 # SCSI device support
 #
@@ -1761,6 +1757,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=y
@@ -1779,17 +1776,18 @@ CONFIG_DM_CRYPT=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
-CONFIG_DUMMY=y
+# CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_MII=y
 # CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
+CONFIG_MACVLAN=y
+# CONFIG_MACVTAP is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_TUN=y
-# CONFIG_VETH is not set
+CONFIG_VETH=y
 
 #
 # CAIF transport drivers
@@ -1856,7 +1854,7 @@ CONFIG_SLIP_MODE_SLIP6=y
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 CONFIG_USB_USBNET=y
-CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
 # CONFIG_USB_NET_CDC_EEM is not set
 CONFIG_USB_NET_CDC_NCM=y
@@ -1899,9 +1897,13 @@ CONFIG_WLAN=y
 # CONFIG_BCM4339 is not set
 CONFIG_BCM4354=y
 # CONFIG_BCM43241 is not set
-CONFIG_BCMDHD_FW_PATH="/system/etc/wifi/bcmdhd_sta.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/nvram_net.txt"
+# CONFIG_BCM43455 is not set
+# CONFIG_BCM4334W is not set
+# CONFIG_BCM43454 is not set
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd_sta.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/nvram_net.txt"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
+# CONFIG_WIFI_BROADCOM_COB is not set
 CONFIG_WLAN_REGION_CODE=100
 # CONFIG_WIFI_2GHZ_VHT_NO_SUPPORT is not set
 CONFIG_WLAIBSS=y
@@ -2006,9 +2008,9 @@ CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 # CONFIG_JOYSTICK_AS5011 is not set
 # CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_XPAD=y
+# CONFIG_JOYSTICK_XPAD_FF is not set
+# CONFIG_JOYSTICK_XPAD_LEDS is not set
 # CONFIG_TOUCHDISC_VTD518_SHINETSU is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -2045,6 +2047,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI is not set
 # CONFIG_SEC_TSP_FACTORY is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_RMI4_I2C is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_PREVENT_HSYNC_LEAKAGE is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT1664S is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT1188S is not set
 # CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP4 is not set
@@ -2085,7 +2088,6 @@ CONFIG_TOUCHSCREEN_CYPRESS_CYTTSP4_I2C=y
 # CONFIG_TOUCHSCREEN_FTS is not set
 # CONFIG_TOUCHSCREEN_FTS_S is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_JSGLTE is not set
-CONFIG_TOUCHBOOST_CONTROL=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -2135,7 +2137,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_SERIAL_NONSTANDARD is not set
@@ -2192,6 +2194,7 @@ CONFIG_DIAG_OVER_USB=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_MSM=y
+# CONFIG_NVRAM is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
@@ -2502,7 +2505,21 @@ CONFIG_THERMAL_TSENS8974=y
 CONFIG_THERMAL_MONITOR=y
 CONFIG_THERMAL_QPNP=y
 CONFIG_THERMAL_QPNP_ADC_TM=y
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -2643,6 +2660,7 @@ CONFIG_IR_LIRC_CODEC=y
 # CONFIG_MSM_CAMERA is not set
 CONFIG_MSMB_CAMERA=y
 # CONFIG_MSMB_CAMERA_DEBUG is not set
+CONFIG_MSMB_CAMERA_MM=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y
@@ -2657,14 +2675,15 @@ CONFIG_MSM_ISPIF=y
 # CONFIG_IMX134 is not set
 CONFIG_IMX135=y
 # CONFIG_S5K6B2YX is not set
-CONFIG_S5K8B1YX=y
 # CONFIG_OV2720 is not set
 # CONFIG_MT9M114 is not set
 # CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE is not set
 CONFIG_MSMB_JPEG=y
+CONFIG_S5K8B1YX=y
 CONFIG_COMPANION=y
 CONFIG_MSM_VIDC_V4L2=y
 # CONFIG_MSM_WFD is not set
+# CONFIG_SECURE_DEMUX_ENABLE is not set
 # CONFIG_MSM_VCAP is not set
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
@@ -2871,11 +2890,13 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_JPN_DEMUX_MOD is not set
 # CONFIG_TDMB is not set
 # CONFIG_ISDBTMM is not set
 # CONFIG_ISDBT is not set
 # CONFIG_ISDBT_SPMI is not set
 # CONFIG_ISDBT_ANT_DET is not set
+# CONFIG_ISDBT_F_TYPE_ANTENNA is not set
 # CONFIG_MTV is not set
 
 #
@@ -2934,6 +2955,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_VIDEO_MHL_V2=y
 # CONFIG_VIDEO_MHL_SII8246 is not set
 CONFIG_MHL_VERSION=0x21
+# CONFIG_MUIC_SUPPORT_MULTIMEDIA_DOCK is not set
 CONFIG_FB_MSM=y
 # CONFIG_FB_MSM_BACKLIGHT is not set
 # CONFIG_FB_MSM_LOGO is not set
@@ -2941,6 +2963,7 @@ CONFIG_FB_MSM=y
 # CONFIG_FB_MSM_TRIPLE_BUFFER is not set
 # CONFIG_FB_MSM_MDP_HW is not set
 CONFIG_FB_MSM_MDSS_COMMON=y
+# CONFIG_MDP_DEBUG_FS is not set
 # CONFIG_FB_MSM_MDP22 is not set
 # CONFIG_FB_MSM_MDP30 is not set
 # CONFIG_FB_MSM_MDP31 is not set
@@ -3043,7 +3066,6 @@ CONFIG_FB_MSM_MDSS_HDMI_PANEL=y
 # CONFIG_MDNIE_VIDEO_ENHANCED is not set
 # CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS is not set
 # CONFIG_FB_MSM_MDSS_MDP3 is not set
-CONFIG_FB_MSM_MDSS_KCAL_CTRL=y
 CONFIG_FB_MSM_MDSS_DBG_SEQ_TICK=y
 CONFIG_FB_MSM_MDSS_DSI_DBG=y
 # CONFIG_SAMSUNG_CMC624 is not set
@@ -3076,6 +3098,7 @@ CONFIG_FB_MSM_MIPI_SAMSUNG_OCTA_CMD_WQHD_PT_PANEL=y
 # CONFIG_BACKLIGHT_IC_KTD253 is not set
 # CONFIG_BACKLIGHT_IC_KTD2801 is not set
 # CONFIG_REGULATOR_LP8720 is not set
+# CONFIG_NEW_UX_MDNIE is not set
 # CONFIG_DUAL_LCD is not set
 # CONFIG_LCD_HMT is not set
 # CONFIG_FB_MSM_MIPI_JDI_TFT_VIDEO_FULL_HD_PT_PANEL is not set
@@ -3111,6 +3134,7 @@ CONFIG_FB_MSM_CAMERA_CSC=y
 # CONFIG_CLK_TUNING is not set
 # CONFIG_MDP_NEGATIVE_SUPPORT is not set
 # CONFIG_MDSS_UD_FLIP is not set
+# CONFIG_PANEL_RECOVERY is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -3181,7 +3205,6 @@ CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
 # CONFIG_SND_SOC_QDSP6 is not set
 CONFIG_SND_SOC_QDSP6V2=y
 CONFIG_AUDIO_OCMEM=y
-CONFIG_DOLBY_DAP=y
 CONFIG_SND_SOC_MSM8974=y
 CONFIG_SND_SOC_APQ8074=y
 # CONFIG_SND_SOC_ES_515 is not set
@@ -3199,6 +3222,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX98504A is not set
 # CONFIG_SND_SOC_MAX98505 is not set
+# CONFIG_SND_SOC_MAX98506 is not set
+# CONFIG_SND_SOC_MAXIM_DSM_CAL is not set
 CONFIG_SND_SOC_WCD9320=y
 # CONFIG_SND_SOC_ES325 is not set
 # CONFIG_SND_SOC_ES325_ATLANTIC is not set
@@ -3208,7 +3233,6 @@ CONFIG_SND_SOC_WCD9320=y
 CONFIG_SND_SOC_ES705=y
 CONFIG_SND_SOC_MSM_STUB=y
 CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=y
-CONFIG_BOEFFLA_SOUND=y
 
 #
 # eS705 Bus Interface
@@ -3379,8 +3403,7 @@ CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_KARMA=y
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ENE_UB6250=y
-# CONFIG_USB_UAS is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
 # CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_STORAGE_DETECT=y
 
@@ -3508,7 +3531,7 @@ CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_G_ANDROID=y
 CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE=y
 CONFIG_USB_DUN_SUPPORT=y
-CONFIG_USB_ANDROID_SAMSUNG_MTP=y
+# CONFIG_USB_ANDROID_SAMSUNG_MTP is not set
 CONFIG_USB_ANDROID_SAMSUNG_SIDESYNC=y
 # CONFIG_USB_LOCK_SUPPORT_FOR_MDM is not set
 CONFIG_USB_NCM_SUPPORT_MTU_CHANGE=y
@@ -3528,6 +3551,7 @@ CONFIG_RMNET_SMD_DATA_CHANNEL=""
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_OTG_WAKELOCK is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_MSM_OTG_72K is not set
@@ -3623,7 +3647,6 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_MAX77804K=y
 # CONFIG_LEDS_KTD2026 is not set
-CONFIG_BOEFFLA_TOUCH_KEY_CONTROL=y
 
 #
 # iptables trigger is under Netfilter config (LED target)
@@ -3643,8 +3666,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_ALARM=y
-CONFIG_RTC_INTF_ALARM_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 # CONFIG_RTC_DRV_TEST is not set
 
@@ -3687,7 +3708,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 #
 # Platform RTC drivers
 #
-# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
@@ -3884,7 +3905,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_SENSORS_ASP01_IIO is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_ZSMALLOC is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
@@ -3903,6 +3923,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_IPC_32BIT=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOGGER=y
 CONFIG_LOGCAT_SIZE=512
@@ -3911,17 +3933,16 @@ CONFIG_ANDROID_RAM_CONSOLE=y
 # CONFIG_PERSISTENT_TRACER is not set
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_SEC_OOM_KILLER=y
 # CONFIG_SEC_DEBUG_LMK_MEMINFO is not set
 # CONFIG_SEC_DEBUG_LMK_COUNT_INFO is not set
 # CONFIG_ANDROID_SWITCH is not set
-# CONFIG_ANDROID_INTF_ALARM_DEV is not set
+# CONFIG_RUNTIME_COMPCACHE is not set
 CONFIG_SAMP_HOTNESS=y
+CONFIG_ANDROID_INTF_ALARM_DEV=y
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
-CONFIG_VNSWAP=y
 
 #
 # Qualcomm MSM specific device drivers
@@ -3947,14 +3968,11 @@ CONFIG_HAVE_CLK_PREPARE=y
 #
 # Hardware Spinlock drivers
 #
-CONFIG_VIBETONZ=y
-CONFIG_TACTILE_ASSIST=y
+CONFIG_SS_VIBRATOR=y
 CONFIG_MOTOR_DRV_MAX77804K=y
 # CONFIG_MOTOR_DRV_ISA1400 is not set
 # CONFIG_MOTOR_DRV_DRV2603 is not set
-# CONFIG_DRV2604_VIBRATOR is not set
 # CONFIG_MOTOR_ISA1000 is not set
-# CONFIG_MOTOR_DRV_TSP5000 is not set
 # CONFIG_MSM_VIBRATOR is not set
 # CONFIG_MAX77826_VIBRATOR is not set
 # CONFIG_CONFIG_HAPTIC_ISA1200 is not set
@@ -3990,9 +4008,6 @@ CONFIG_DEVFREQ_GOV_MSM_CPUBW_HWMON=y
 #
 # DEVFREQ Drivers
 #
-CONFIG_MOBICORE_SUPPORT=y
-# CONFIG_MOBICORE_DEBUG is not set
-CONFIG_MOBICORE_API=y
 # CONFIG_CORESIGHT is not set
 CONFIG_BIF=y
 CONFIG_BIF_QPNP=y
@@ -4000,7 +4015,7 @@ CONFIG_BATTERY_SAMSUNG=y
 CONFIG_BATTERY_SAMSUNG_DATA_FILE=""
 # CONFIG_BATTERY_SAMSUNG_DATA is not set
 # CONFIG_CHARGING_VZWCONCEPT is not set
-# CONFIG_BATTERY_SWELLING is not set
+CONFIG_BATTERY_SWELLING=y
 # CONFIG_FUELGAUGE_DUMMY is not set
 # CONFIG_FUELGAUGE_MAX17042 is not set
 CONFIG_FUELGAUGE_MAX17048=y
@@ -4021,7 +4036,9 @@ CONFIG_SAMSUNG_LPM_MODE=y
 # CONFIG_SAMSUNG_BATTERY_ENG_TEST is not set
 # CONFIG_SAMSUNG_BATTERY_FACTORY is not set
 # CONFIG_SAMSUNG_BATTERY_DISALLOW_DEEP_SLEEP is not set
+# CONFIG_DISABLE_SAVE_CAPACITY_MAX is not set
 # CONFIG_EN_OOPS is not set
+# CONFIG_CONTROL_OTG_POPUP is not set
 # CONFIG_SENSORS is not set
 # CONFIG_SENSORS_BMI055 is not set
 # CONFIG_SENSORS_BMI058 is not set
@@ -4135,7 +4152,7 @@ CONFIG_EXTCON_MAX77804K=y
 #
 # CONFIG_IR_REMOCON_MC96FR116 is not set
 # CONFIG_IRDA_COMMON_LDO is not set
-CONFIG_SEC_NET_FILTER=y
+# CONFIG_ANDROID_FFF is not set
 # CONFIG_MACH_BAFFIN2_SGLTE is not set
 
 #
@@ -4166,19 +4183,30 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -4206,9 +4234,23 @@ CONFIG_EXFAT_FS=y
 CONFIG_EXFAT_VIRTUAL_XATTR=y
 CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
 CONFIG_EXFAT_SUPPORT_STLOG=y
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
+# CONFIG_NTFS_FS is not set
+CONFIG_SDFAT_FS=y
+CONFIG_SDFAT_DELAYED_META_DIRTY=y
+# CONFIG_SDFAT_SUPPORT_DIR_SYNC is not set
+CONFIG_SDFAT_DEFAULT_CODEPAGE=437
+CONFIG_SDFAT_DEFAULT_IOCHARSET="utf8"
+# CONFIG_SDFAT_CHECK_RO_ATTR is not set
+CONFIG_SDFAT_ALIGNED_MPAGE_WRITE=y
+CONFIG_SDFAT_VIRTUAL_XATTR=y
+CONFIG_SDFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0"
+CONFIG_SDFAT_SUPPORT_STLOG=y
+CONFIG_SDFAT_DEBUG=y
+# CONFIG_SDFAT_DBG_IOCTL is not set
+CONFIG_SDFAT_DBG_MSG=y
+# CONFIG_SDFAT_DBG_BUGON is not set
+# CONFIG_SDFAT_DBG_WARNON is not set
+CONFIG_SDFAT_STATISTICS=y
 
 #
 # Pseudo filesystems
@@ -4220,23 +4262,22 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_STLOG=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=y
 CONFIG_WTL_ENCRYPTION_FILTER=y
 CONFIG_ECRYPT_FS_VIRTUAL_FAT_XATTR=y
-CONFIG_SDP=y
-CONFIG_SDCARD_FS=y
-CONFIG_SDCARD_FS_CI_SEARCH=y
-CONFIG_SDCARD_FS_XATTR=y
-# CONFIG_SCFS is not set
+# CONFIG_FORCE_DISABLE_FIPS is not set
+CONFIG_SCFS=y
 # CONFIG_SYSTEM_COMPRESSED is not set
-# CONFIG_SCFS_LOWER_PAGECACHE_INVALIDATION is not set
+CONFIG_SCFS_LOWER_PAGECACHE_INVALIDATION=y
+# CONFIG_SCFS_USE_CRYPTO is not set
+CONFIG_SDCARD_FS=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -4256,28 +4297,10 @@ CONFIG_SDCARD_FS_XATTR=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_FS is not set
 # CONFIG_NFSD is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-# CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -4321,13 +4344,13 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
-CONFIG_DYNAMIC_FSYNC=y
+# CONFIG_DLM is not set
 
 #
 # Kernel hacking
 #
 CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=6
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
@@ -4340,12 +4363,13 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR_NMI is not set
+# CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SYSRQ_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
@@ -4415,7 +4439,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_CPU_FREQ_SWITCH_PROFILER is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
-CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_PANIC_ON_DATA_CORRUPTION is not set
@@ -4465,6 +4489,7 @@ CONFIG_PID_IN_CONTEXTIDR=y
 # Samsung Rooting Restriction Feature
 #
 # CONFIG_SEC_RESTRICT_ROOTING is not set
+# CONFIG_RESTART_REASON_SEC_PARAM is not set
 # CONFIG_RESTART_REASON_DDR is not set
 
 #
@@ -4479,28 +4504,36 @@ CONFIG_KEYS=y
 # CONFIG_ENCRYPTED_KEYS is not set
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 # CONFIG_SECURITY_PATH is not set
-CONFIG_LSM_MMAP_MIN_ADDR=4096
+CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_SECURITY_SELINUX=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-CONFIG_SEC_SELINUX=y
+# CONFIG_SEC_SELINUX is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_YAMA is not set
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
+
+#
+# ICCC
+#
+CONFIG_TZ_ICCC=y
+# CONFIG_TZ_ICCC_DEBUG is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
@@ -4521,13 +4554,14 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_ABLK_HELPER=y
 # CONFIG_CRYPTO_USER is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 # CONFIG_CRYPTO_PCRYPT is not set
 CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=y
 
@@ -4570,8 +4604,10 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA512_ARM_NEON=y
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set
 
@@ -4580,6 +4616,7 @@ CONFIG_CRYPTO_SHA512=y
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AES_ARM_BS=y
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -4602,18 +4639,26 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_ZLIB is not set
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=y
+# CONFIG_CRYPTO_LZ4HC is not set
 
 #
 # Random Number Generation
 #
-CONFIG_CRYPTO_ANSI_CPRNG=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
 # CONFIG_CRYPTO_USER_API_HASH is not set
 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_QCE50=y
 # CONFIG_FIPS_ENABLE is not set
-# CONFIG_CRYPTO_DEV_QCRYPTO is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-# CONFIG_CRYPTO_DEV_QCEDEV is not set
+CONFIG_CRYPTO_DEV_QCRYPTO=y
+CONFIG_CRYPTO_DEV_QCE=y
+CONFIG_CRYPTO_DEV_QCEDEV=y
 # CONFIG_CRYPTO_DEV_OTA_CRYPTO is not set
 CONFIG_BINARY_PRINTF=y
 
@@ -4641,6 +4686,8 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
 # CONFIG_XZ_DEC is not set
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_DECOMPRESS_GZIP=y