Merge "Merge android11-5.4.86+ (48ffcbf) into msm-5.4"

android/GKI_VERSION

@@ -1 +1 @@
-LTS_5.4.86_ccdcd307cf7e
+LTS_5.4.86_48ffcbf0b9e7

android/abi_gki_aarch64_qcom

@@ -45,10 +45,12 @@
   backlight_device_unregister
   bin2hex
   __bitmap_clear
+  bitmap_find_free_region
   bitmap_find_next_zero_area_off
   bitmap_free
   bitmap_parselist
   bitmap_print_to_pagebuf
+  bitmap_release_region
   __bitmap_set
   __bitmap_subset
   bitmap_zalloc
@@ -1803,6 +1805,7 @@
   __pm_runtime_use_autosuspend
   __pm_stay_awake
   pm_stay_awake
+  pm_system_cancel_wakeup
   pm_system_wakeup
   pm_wakeup_dev_event
   pm_wakeup_ws_event
@@ -2024,6 +2027,7 @@
   rpmsg_set_signals
   rpmsg_trysend
   rpmsg_unregister_device
+  rtc_add_group
   rtc_class_close
   rtc_class_open
   rtc_read_time

drivers/base/power/wakeup.c

@@ -925,6 +925,7 @@ void pm_system_cancel_wakeup(void)
 {
 	atomic_dec_if_positive(&pm_abort_suspend);
 }
+EXPORT_SYMBOL_GPL(pm_system_cancel_wakeup);
 
 void pm_wakeup_clear(bool reset)
 {

fs/incfs/format.c

@@ -549,7 +549,6 @@ int incfs_read_file_header(struct backing_file_context *bfc,
 	if (!bfc || !first_md_off)
 		return -EFAULT;
 
-	LOCK_REQUIRED(bfc->bc_mutex);
 	bytes_read = incfs_kread(bfc, &fh, sizeof(fh), 0);
 	if (bytes_read < 0)
 		return bytes_read;

fs/incfs/main.c

@@ -30,8 +30,18 @@ static ssize_t corefs_show(struct kobject *kobj,
 
 static struct kobj_attribute corefs_attr = __ATTR_RO(corefs);
 
+static ssize_t mounter_context_for_backing_rw_show(struct kobject *kobj,
+			  struct kobj_attribute *attr, char *buff)
+{
+	return snprintf(buff, PAGE_SIZE, "supported\n");
+}
+
+static struct kobj_attribute mounter_context_for_backing_rw_attr =
+	__ATTR_RO(mounter_context_for_backing_rw);
+
 static struct attribute *attributes[] = {
 	&corefs_attr.attr,
+	&mounter_context_for_backing_rw_attr.attr,
 	NULL,
 };
 

kernel/.gitignore

@@ -1,6 +1,7 @@
 #
 # Generated files
 #
+config_data
 kheaders.md5
 timeconst.h
 hz.bc

kernel/Makefile

@@ -128,10 +128,15 @@ KCOV_INSTRUMENT_stackleak.o := n
 
 $(obj)/configs.o: $(obj)/config_data.gz
 
-targets += config_data.gz
-$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
+targets += config_data config_data.gz
+$(obj)/config_data.gz: $(obj)/config_data FORCE
 	$(call if_changed,gzip)
 
+filechk_cat = cat $<
+
+$(obj)/config_data: $(KCONFIG_CONFIG) FORCE
+	$(call filechk,cat)
+
 $(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz
 
 quiet_cmd_genikh = CHK     $(obj)/kheaders_data.tar.xz