Merge "Merge android11-5.4.86+ (48ffcbf) into msm-5.4" (ee8d6eae) · Commits · e / devices / android_kernel_fairphone_FP5

android/GKI_VERSION

+1 −1

Original line number	Diff line number	Diff line
		LTS_5.4.86_ccdcd307cf7e
		LTS_5.4.86_48ffcbf0b9e7

+362 −408

File changed.

Preview size limit exceeded, changes collapsed.

+1883 −916

File changed and moved.

Preview size limit exceeded, changes collapsed.

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{