Merge remote-tracking branch 'sudeep/juno_freq+idle' into juno-release

Conflicts:
	arch/arm64/boot/dts/juno.dts
	arch/arm64/configs/defconfig
	arch/arm64/kernel/topology.c
	drivers/clk/clk-scpi.c
	drivers/cpufreq/scpi-cpufreq.c
	drivers/input/serio/ambakmi.c
	drivers/mailbox/arm_mhu.c
	include/uapi/linux/audit.h

diff --cc Documentation/DocBook/drm.tmpl
Simple merge

diff --cc arch/arm64/boot/dts/juno.dts
index f2ccbaa,c69a7bd..fe1252a
--- 1/arch/arm64/boot/dts/juno.dts
--- 2/arch/arm64/boot/dts/juno.dts
+++ b/arch/arm64/boot/dts/juno.dts
@@@ -138,18 -162,34 +164,34 @@@
  
        timer {
                compatible = "arm,armv8-timer";
 -              interrupts = <1 13 0xff01>,
 -                           <1 14 0xff01>,
 -                           <1 11 0xff01>,
 -                           <1 10 0xff01>;
 +              interrupts = <GIC_PPI 13 0xff01>,
 +                           <GIC_PPI 14 0xff01>,
 +                           <GIC_PPI 11 0xff01>,
 +                           <GIC_PPI 10 0xff01>;
        };
  
+       timer@2a810000 {
+               compatible = "arm,armv7-timer-mem";
+               reg = <0x0 0x2a810000 0x0 0x10000>;
+               clock-frequency = <100000000>;
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+               frame@2a830000 {
+                       frame-number = <1>;
+                       interrupts = <0 60 4>;
+                       reg = <0x0 0x2a830000 0x0 0x10000>;
+               };
+       };
+ 
        pmu {
                compatible = "arm,armv8-pmuv3";
-               interrupts = <GIC_SPI 60 4>,
-                            <GIC_SPI 61 4>,
-                            <GIC_SPI 62 4>,
-                            <GIC_SPI 63 4>;
+               interrupts = <0 18 4>,
+                            <0 22 4>,
+                            <0 26 4>,
+                            <0 30 4>,
+                            <0 02 4>,
+                            <0 06 4>;
        };
  
        psci {

diff --cc arch/arm64/configs/defconfig
index 28c93ef,fa2c3c9..8b99f3b
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -11,21 -12,12 +12,27 @@@ CONFIG_BSD_PROCESS_ACCT_V3=
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
  CONFIG_LOG_BUF_SHIFT=14
 +CONFIG_CGROUPS=y
 +CONFIG_CGROUP_FREEZER=y
 +CONFIG_CGROUP_DEVICE=y
 +CONFIG_CPUSETS=y
 +CONFIG_CGROUP_CPUACCT=y
 +CONFIG_RESOURCE_COUNTERS=y
 +CONFIG_MEMCG=y
 +CONFIG_MEMCG_KMEM=y
 +CONFIG_CGROUP_PERF=y
 +CONFIG_CGROUP_SCHED=y
 +CONFIG_CFS_BANDWIDTH=y
 +CONFIG_RT_GROUP_SCHED=y
 +CONFIG_BLK_CGROUP=y
 +CONFIG_NAMESPACES=y
 +CONFIG_USER_NS=y
+ CONFIG_NAMESPACES=y
+ # CONFIG_UTS_NS is not set
+ # CONFIG_IPC_NS is not set
+ # CONFIG_PID_NS is not set
+ # CONFIG_NET_NS is not set
+ CONFIG_SCHED_AUTOGROUP=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_EXPERT=y
  CONFIG_KALLSYMS_ALL=y
@@@ -83,14 -63,11 +91,16 @@@ CONFIG_IP_PNP_DHCP=
  CONFIG_IP_PNP_BOOTP=y
  # CONFIG_INET_LRO is not set
  # CONFIG_IPV6 is not set
+ CONFIG_DNS_RESOLVER=y
  # CONFIG_WIRELESS is not set
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
 +CONFIG_DEVTMPFS_MOUNT=y
 +# CONFIG_STANDALONE is not set
 +# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 +CONFIG_CONNECTOR=y
 +CONFIG_BLK_DEV_LOOP=y
 +CONFIG_BLK_DEV_RAM=y
+ CONFIG_DMA_CMA=y
  CONFIG_VIRTIO_BLK=y
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
@@@ -131,65 -91,19 +141,69 @@@ CONFIG_GPIO_PL061=
  # CONFIG_HWMON is not set
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
 +CONFIG_REGULATOR_VEXPRESS=m
 +CONFIG_DRM=y
 +CONFIG_DRM_I2C_CH7006=m
 +CONFIG_DRM_I2C_SIL164=m
 +CONFIG_DRM_I2C_NXP_TDA998X=y
 +CONFIG_DRM_ARM=y
 +CONFIG_DRM_HDLCD=m
 +CONFIG_FB_MODE_HELPERS=y
 +CONFIG_FB_TILEBLITTING=y
+ CONFIG_FB=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
 +CONFIG_HID_CHERRY=m
  CONFIG_USB=y
 -CONFIG_USB_ISP1760_HCD=y
 +# CONFIG_USB_OTG_WHITELIST is not set
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_HCD_SYNOPSYS=y
 +CONFIG_USB_ISP1760_HCD=m
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_STORAGE_REALTEK=m
 +CONFIG_USB_STORAGE_DATAFAB=m
 +CONFIG_USB_STORAGE_FREECOM=m
 +CONFIG_USB_STORAGE_ISD200=m
 +CONFIG_USB_STORAGE_USBAT=m
 +CONFIG_USB_STORAGE_SDDR09=m
 +CONFIG_USB_STORAGE_SDDR55=m
 +CONFIG_USB_STORAGE_JUMPSHOT=m
 +CONFIG_USB_STORAGE_ALAUDA=m
 +CONFIG_USB_STORAGE_ONETOUCH=m
 +CONFIG_USB_STORAGE_KARMA=m
 +CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 +CONFIG_USB_STORAGE_ENE_UB6250=m
 +CONFIG_USB_UAS=m
 +CONFIG_USB_OTG_FSM=m
 +CONFIG_NOP_USB_XCEIV=m
 +CONFIG_SAMSUNG_USB2PHY=m
 +CONFIG_SAMSUNG_USB3PHY=m
 +CONFIG_USB_GPIO_VBUS=m
 +CONFIG_USB_ISP1301=m
 +CONFIG_USB_RCAR_PHY=m
 +CONFIG_USB_ULPI=y
  CONFIG_MMC=y
  CONFIG_MMC_ARMMMCI=y
 +CONFIG_RTC_CLASS=y
 +CONFIG_RTC_DRV_PL031=y
 +CONFIG_VIRT_DRIVERS=y
 +CONFIG_VIRTIO_BALLOON=y
 +CONFIG_VIRTIO_MMIO=y
 +CONFIG_STAGING=y
 +CONFIG_ANDROID=y
 +CONFIG_ANDROID_BINDER_IPC=y
 +CONFIG_ASHMEM=y
 +CONFIG_ANDROID_LOGGER=y
 +CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 +CONFIG_ANDROID_INTF_ALARM_DEV=y
 +CONFIG_SYNC=y
 +CONFIG_SW_SYNC=y
 +CONFIG_SW_SYNC_USER=y
+ CONFIG_VIRT_DRIVERS=y
+ CONFIG_VIRTIO_BALLOON=y
+ CONFIG_VIRTIO_MMIO=y
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_MAILBOX=y
  CONFIG_ARM_SCPI_PROTOCOL=y
@@@ -200,34 -114,22 +214,42 @@@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=
  CONFIG_DEVFREQ_GOV_PERFORMANCE=y
  CONFIG_DEVFREQ_GOV_POWERSAVE=y
  CONFIG_DEVFREQ_GOV_USERSPACE=y
 +CONFIG_GENERIC_PHY=y
 +CONFIG_EXT4_FS=y
 +CONFIG_EXT4_FS_POSIX_ACL=y
 +CONFIG_FANOTIFY=y
 +CONFIG_AUTOFS4_FS=y
 +CONFIG_FUSE_FS=m
 +CONFIG_CUSE=m
 +CONFIG_FSCACHE=m
 +CONFIG_FSCACHE_STATS=y
 +CONFIG_FSCACHE_HISTOGRAM=y
 +CONFIG_FSCACHE_OBJECT_LIST=y
 +CONFIG_CACHEFILES=m
+ CONFIG_EXT2_FS=y
+ CONFIG_EXT3_FS=y
+ # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+ # CONFIG_EXT3_FS_XATTR is not set
+ CONFIG_EXT4_FS=y
+ CONFIG_FUSE_FS=y
+ CONFIG_CUSE=y
  CONFIG_VFAT_FS=y
  CONFIG_TMPFS=y
 +CONFIG_TMPFS_POSIX_ACL=y
 +CONFIG_HUGETLBFS=y
 +CONFIG_CONFIGFS_FS=m
  # CONFIG_MISC_FILESYSTEMS is not set
  CONFIG_NFS_FS=y
 +CONFIG_NFS_V3_ACL=y
  CONFIG_NFS_V4=y
 +CONFIG_NFS_V4_1=y
 +CONFIG_NFS_V4_2=y
 +CONFIG_NFS_V4_1_MIGRATION=y
  CONFIG_ROOT_NFS=y
+ CONFIG_NFS_USE_LEGACY_DNS=y
  CONFIG_NLS_CODEPAGE_437=y
  CONFIG_NLS_ISO8859_1=y
 +CONFIG_NLS_UTF8=y
  CONFIG_VIRTUALIZATION=y
  CONFIG_KVM=y
  CONFIG_PRINTK_TIME=y

diff --cc drivers/mailbox/arm_mhu.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/uapi/linux/audit.h
index e7df2e3,4c31a36..629934c
--- 1/include/uapi/linux/audit.h
--- 2/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@@ -334,7 -341,7 +341,8 @@@ enum 
  /* distinguish syscall tables */
  #define __AUDIT_ARCH_64BIT 0x80000000
  #define __AUDIT_ARCH_LE          0x40000000
+ 
 +#define AUDIT_ARCH_AARCH64    (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ALPHA      (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ARM                (EM_ARM|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ARMEB      (EM_ARM)

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
index 0ac2d20,0fdb96d..c6b09d5
--- 1/kernel/sched/fair.c
--- 2/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -7663,20 -6704,18 +7664,22 @@@ static int idle_balance(struct rq *this
        }
        rcu_read_unlock();
  
 +#ifdef CONFIG_SCHED_HMP
 +      if (!pulled_task)
 +              pulled_task = hmp_idle_pull(this_cpu);
 +#endif
        raw_spin_lock(&this_rq->lock);
  
+       if (curr_cost > this_rq->max_idle_balance_cost)
+               this_rq->max_idle_balance_cost = curr_cost;
+ 
        /*
-        * While browsing the domains, we released the rq lock.
-        * A task could have be enqueued in the meantime
+        * While browsing the domains, we released the rq lock, a task could
+        * have been enqueued in the meantime. Since we're not going idle,
+        * pretend we pulled a task.
         */
-       if (this_rq->cfs.h_nr_running && !pulled_task) {
+       if (this_rq->cfs.h_nr_running && !pulled_task)
                pulled_task = 1;
-               goto out;
-       }
  
        if (pulled_task || time_after(jiffies, this_rq->next_balance)) {
                /*