Srinivasarao P
18ffdaaa38
Merge android-4.19-stable.113 (2b82910d) into msm-4.19
* refs/heads/tmp-2b82910d:
Reverting incrementalfs, power,usb and scheduler changes
ANDROID: Incremental fs: Fix four resource bugs
ANDROID: Bulk update the ABI xml based on the referenced bugs.
ANDROID: GKI: block: resolve ABI diff when CONFIG_BLK_DEV_BSG is unset
ANDROID: GKI: bfq-iosched: update struct elevator_mq_ops ABI
ANDROID: GKI: locking/rwsem: add vendor field to struct rw_semaphore
ANDROID: GKI: fs: add umount_end() function to struct super_operations
ANDROID: GKI: perf: Add fields for CPU hotplug feature
ANDROID: GKI: perf: Add field for struct perf_event
ANDROID: GKI: cpuset: add field for task affinity for cpusets
UPSTREAM: ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
UPSTREAM: f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
UPSTREAM: ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
UPSTREAM: fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
UPSTREAM: usb: raw_gadget: fix compilation warnings in uapi headers
BACKPORT: usb: gadget: add raw-gadget interface
UPSTREAM: usb: gadget: move choice ... endchoice to legacy/Kconfig
UPSTREAM: ipv6: ndisc: add support for 'PREF64' dns64 prefix identifier
ANDROID: GKI: Removed cuttlefish configs
ANDROID: GKI: Removed cuttlefish configs
ANDROID: clang: update to 10.0.5
FROMLIST: arm64: define __alloc_zeroed_user_highpage
ANDROID: Incremental fs: Add INCFS_IOC_GET_FILLED_BLOCKS
ANDROID: Incremental fs: Fix two typos
ANDROID: GKI: Update ABI
ANDROID: GKI: power_supply: add more soc properties
ANDROID: GKI: Update ABI
ANDROID: GKI: google_battery: return string type for serial_number property
ANDROID: GKI: power: supply: Add APSD based power-supply properties
ANDROID: GKI: power: supply: Remove "Wipower" PSY type
ANDROID: GKI: power: supply: Add support for HVDCP_3P5
ANDROID: GKI: power_supply: Define Debug Accessory Mode
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_AICL_*
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_ALIGNMENT
ANDROID: GKI: power_supply: Add CP_ISNS_SLAVE power supply property
ANDROID: GKI: power_supply: add properties to report parallel connection topology
ANDROID: GKI: power_supply: add POWER_SUPPLY_PROP_IRQ_STATUS property
ANDROID: GKI: power: supply: add CHARGE_CHARGER_STATE property
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_PTMC_ID
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_OTG_FASTROLESWAP
ANDROID: GKI: power: supply: Add VOLTAGE_STEP property
ANDROID: GKI: power: supply: Add AICL_DONE parameter
ANDROID: GKI: power_supply: Add operating frequency property
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_CC_UAH
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_VOLTAGE_FIFO
ANDROID: GKI: power: supply: Add capacity and resistance estimates
ANDROID: GKI: power_supply: Add vendor specific dead battery property
ANDROID: GKI: power-supply: add ADAPTER_DETAILS power supply property
ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_CHARGE_DISABLE
ANDROID: GKI: power: power_supply: Add property to display skin thermal status
ANDROID: GKI: power_supply: Add properties to support PPS constant current(CC) mode
ANDROID: GKI: power: power_supply: Add REAL_CAPACITY property
ANDROID: GKI: power_supply: Add VOLTAGE_MAX_LIMIT power supply property
ANDROID: GKI: power_supply: Add DC_RESET power-supply property
ANDROID: GKI: power_supply: Add "THERM_ICL_LIMIT" property
ANDROID: GKI: power_supply: add CHIP_VERSION property
ANDROID: GKI: power-supply: Add VOLTAGE_VPH power supply property
ANDROID: GKI: power_supply: Add SCALE_MODE_EN power-supply property
ANDROID: GKI: power_supply: Add local extensions of string property names properly
ANDROID: GKI: power_supply: add batt_age_level property
ANDROID: GKI: power-supply: Add CC_SOC power supply property
ANDROID: GKI: power_supply: add property to disable QC userspace optimizations
ANDROID: GKI: power: power_supply: Add FG_RESET power supply property
ANDROID: GKI: power_supply: Add power supply type "Charge Pump"
ANDROID: GKI: power: supply: Add snapshot of power supply framework files
ANDROID: GKI: power: power_supply: Add property CHARGE_COUNTER_EXT and 64-bit precision properties
ANDROID: GKI: power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED
ANDROID: GKI: power: power_supply: add POWER_SUPPLY_PROP_USB_OTG
ANDROID: GKI: power: power_supply: Add custom property for USB High Current mode
UPSTREAM: coresight: Potential uninitialized variable in probe()
ANDROID: GKI: Update ABI.
ANDROID: GKI: Add API to create pagetable mappings.
ANDROID: GKI: drivers: usb: Add functions usb_func_ep_queue/usb_func_wakeup
ANDROID: GKI: Add API usb_ep_autoconfig_by_name
ANDROID: GKI: usb: core: Add helper function to return controller id
ANDROID: dm-bow: Fix free_show value is incorrect
ANDROID: GKI: update ABI after fixing cfg80211_chan_def diff
BACKPORT: nl80211: Add support for EDMG channels
FROMGIT: sched/rt: cpupri_find: Trigger a full search as fallback
FROMGIT: sched/rt: Remove unnecessary push for unfit tasks
BACKPORT: FROMGIT: sched/rt: Allow pulling unfitting task
FROMGIT: sched/rt: Optimize cpupri_find() on non-heterogenous systems
FROMGIT: sched/rt: Re-instate old behavior in select_task_rq_rt()
BACKPORT: FROMGIT: sched/rt: cpupri_find: Implement fallback mechanism for !fit case
ANDROID: GKI: re-enable LTO, CFI and SCS
Conflicts:
arch/arm64/mm/mmu.c
drivers/net/wireless/ath/wil6210/cfg80211.c
drivers/usb/gadget/Kconfig
include/linux/memblock.h
include/linux/perf_event.h
include/linux/rwsem.h
include/uapi/linux/nl80211.h
Change-Id: I7aa8a1712c323fc5a2eced52a07bfb6df6996ba0
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-07-16 20:55:24 +05:30
..
2018-04-06 14:05:14 +01:00
2018-08-07 14:20:23 -05:00
2019-09-23 14:11:57 -07:00
2018-04-24 13:40:42 -04:00
2018-06-09 10:32:39 -07:00
2018-04-09 21:12:31 +01:00
2018-06-07 17:34:39 -07:00
2018-06-07 17:34:39 -07:00
2018-06-07 17:34:39 -07:00
2018-06-04 20:46:02 +02:00
2018-01-28 17:00:36 +11:00
2018-01-01 12:45:37 -07:00
2020-01-28 10:36:50 -08:00
2020-04-21 06:19:04 -07:00
2020-01-09 15:11:34 -08:00
2018-03-20 17:11:45 +01:00
2018-04-12 10:07:51 -07:00
2019-09-23 14:11:54 -07:00
2018-08-21 18:19:09 -07:00
2018-01-13 10:42:48 -08:00
2018-04-04 14:05:48 -04:00
2019-09-21 07:56:42 +02:00
2018-06-07 17:34:39 -07:00
2020-03-18 07:14:21 +01:00
2020-03-27 10:48:20 -07:00
2018-08-22 23:21:44 +09:00
2018-07-10 15:11:00 -06:00
2018-08-17 16:20:28 -07:00
2018-01-16 16:59:55 +01:00
2018-05-08 09:31:31 -06:00
2018-02-27 10:25:33 +01:00
2017-12-21 13:39:28 -07:00
2018-08-30 17:08:35 +02:00
2018-07-26 10:15:17 -07:00