Merge branch 'google/experimental/android-4.14' into release/android/qcomlt-4.14-common

* google/experimental/android-4.14: (365 commits)
  f2fs: updates on 4.15-rc1
  ANDROID: arch_topology: fix build for !CONFIG_CPU_FREQ
  ANDROID: ARM64: Tweak defconfig Android EAS features
  ANDROID: ARM64: Tweak defconfig for EAS platforms
  ANDROID: DEBUG: accumulate debug output and dump all at the end of energy_diff
  ANDROID: sched/fair: prevent meaningless active migration
  ANDROID: sched/fair: Fall back to slow path wakeup placement if needed
  ANDROID: DEBUG: Temporarily disable lockdep asserting on update_task_ravg
  ANDROID: sched: Introduce Window Assisted Load Tracking (WALT)
  ANDROID: Add find_best_target to minimise energy calculation overhead
  ANDROID: Combined EAS Load Balance Tweaks
  ANDROID: sched/fair: re-factor energy_diff to use a single (extensible) energy_env
  ANDROID: sched/fair: consider task utilization in group_norm/max_util()
  ANDROID: refactor select_task_rq_fair et al to be cleaner
  ANDROID: sched: fair: Bypass energy-aware wakeup for prefer-idle tasks
  ANDROID: sched: Move energy-aware decision into a helper function
  ANDROID: sched/fair: Try to estimate possible idle states.
  ANDROID: trace/sched: Add tracepoint for sched_overutilized events
  ANDROID: sched: fair/tune: Add schedtune with cgroups interface
  ANDROID: sched: EAS: take cstate into account when selecting idle core
  ANDROID: sched: Unconditionally honor sync flag for energy-aware wakeups
  ANDROID: sched: Add KConfig option to set ENERGY_AWARE sched feature on
  ANDROID: cpufreq: schedutil: add up/down frequency transition rate limits
  ANDROID: sched: Add per-cpu max capacity to sched_group_capacity
  ANDROID: sched: cpufreq: use PELT rt_rq as estimate of required RT CPU capacity
  ANDROID: trace/sched: add tracepoint for rt_rq PELT signal
  FROMLIST: sched/rt: add utilization tracking
  FROMLIST: sched/fair: Use wake_q length as a hint for wake_wide
  FROMLIST: sched/fair: Update blocked load from newly idle balance
  FROMLIST: sched: force update of blocked load of idle cpus
  UPSTREAM: sched/fair: Sync task util before slow-path wakeup
  UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest
  UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed
  UPSTREAM: sched/fair: Fix find_idlest_group() when local group is not allowed
  UPSTREAM: sched/fair: Remove unnecessary comparison with -1
  UPSTREAM: sched/fair: Move select_task_rq_fair() slow-path into its own function
  UPSTREAM: sched/fair: Force balancing on NOHZ balance if local group has capacity
  ANDROID: sched/events: Introduce task_group load tracking trace event
  ANDROID: sched/events: Introduce sched_entity load tracking trace event
  ANDROID: sched/events: Introduce cfs_rq load tracking trace event
  ANDROID: sched/autogroup: Define autogroup_path() for !CONFIG_SCHED_DEBUG
  ANDROID: sched/debug: Add energy procfs interface
  ANDROID: arm: Support for extracting EAS energy costs from DT
  ANDROID: arm64: Support for extracting EAS energy costs from DT
  ANDROID: arm: Add Energy Model to dtb for TC2
  ANDROID: hisilicon: Add energy model data to hisilicon 6220 dtb
  ANDROID: arm64: Add Energy Model to dtb for Juno-r0 and Juno-r2
  ANDROID: Documentation: DT bindings for energy model cost data required by EAS
  ANDROID: arm64, dts: add hikey cpu capacity-dmips-mhz information
  ANDROID: drivers base/arch_topology: Detect SD_SHARE_CAP_STATES flag
  ANDROID: drivers base/arch_topology: enforce SCHED_CAPACITY_SCALE as highest CPU capacity
  ANDROID: drivers base/arch_topology: fold two pr_debug()'s into one
  ANDROID: sched: Per-Sched-domain over utilization
  ANDROID: sched: Disable energy-unfriendly nohz kicks
  ANDROID: sched: Consider a not over-utilized energy-aware system as balanced
  ANDROID: sched/fair: Energy-aware wake-up task placement
  ANDROID: sched: Add over-utilization/tipping point indicator
  ANDROID: sched/fair: Add energy_diff dead-zone margin
  ANDROID: sched: Determine the current sched_group idle-state
  ANDROID: sched, cpuidle: Track cpuidle state index in the scheduler
  ANDROID: sched: Estimate energy impact of scheduling decisions
  ANDROID: sched: Extend sched_group_energy to test load-balancing decisions
  ANDROID: initramfs: call free_initrd() when skipping init
  FROMLIST: net: xfrm: allow clearing socket xfrm policies.
  FROMLIST: binder: fix proc->files use-after-free
  UPSTREAM: arm64: vdso: fix clock_getres for 4GiB-aligned res
  UPSTREAM: security: bpf: replace include of linux/bpf.h with forward declarations
  BACKPORT: selinux: bpf: Add addtional check for bpf object file receive
  UPSTREAM: selinux: bpf: Add selinux check for eBPF syscall operations
  BACKPORT: security: bpf: Add LSM hooks for bpf object related syscall
  BACKPORT: bpf: Add file mode configuration into bpf maps
  UPSTREAM: arm64: Avoid aligning normal memory pointers in __memcpy_{to,from}io
  UPSTREAM: android: binder: Change binder_shrinker to static
  UPSTREAM: f2fs: expose some sectors to user in inline data or dentry case
  UPSTREAM: tracing: Add support for preempt and irq enable/disable events
  UPSTREAM: tracing: Prepare to add preempt and irq trace events
  BACKPORT: android: binder: Remove unused vma argument
  ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB"
  ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB"
  ANDROID: memory_state_time: fix undefined behavior with missing DT properties
  ANDROID: memory_state_time: Implement memory_state_time, used by qcom,cpubw
  ANDROID: uid_sys_stats: log task io with a debug flag
  ANDROID: uid_sys_stats: check previous uid_entry before call find_or_register_uid
  ANDROID: uid_sys_stats: Kconfig: add depends for UID_SYS_STATS
  ANDROID: uid_sys_stats: defer io stats calulation for dead tasks
  ANDROID: uid_sys_stats: fix access of task_uid(task)
  ANDROID: uid_sys_stats: reduce update_io_stats overhead
  ANDROID: uid_sys_stats: change to use rt_mutex
  ANDROID: uid_sys_stats: account for fsync syscalls
  ANDROID: uid_sys_stats: fix negative write bytes.
  ANDROID: uid_sys_stats: allow writing same state
  ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c
  ANDROID: uid_cputime: add per-uid IO usage accounting
  ANDROID: uid_cputime: Check for the range while removing range of UIDs.
  ANDROID: uid_cputime: Iterates over all the threads instead of processes.
  ANDROID: uid_cputime: fix cputime overflow
  ANDROID: uid_cputime: Adds accounting for the cputimes per uid.
  CHROMIUM: usb: gadget: f_accessory: add .raw_request callback
  CHROMIUM: usb: gadget: f_audio_source: add .free_func callback
  ANDROID: usb: gadget: f_midi: set fi->f to NULL when free f_midi function
  ...

3 files changed, 8 insertions, 2 deletions

diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 808d09f27ad4..11f4067f03e8 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -12,7 +12,7 @@ include scripts/Kbuild.include
 
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
 
 # Figure out what we need to build from the various variables
 # ==========================================================================
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 04b5633df1cf..9ed9464b679f 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -318,6 +318,12 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
 
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 
+# cat
+# ---------------------------------------------------------------------------
+# Concatentate multiple files together
+quiet_cmd_cat = CAT     $@
+cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false)
+
 # Bzip2
 # ---------------------------------------------------------------------------
 
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 51ca0244fc8a..96524c6fa7a5 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -30,7 +30,7 @@ quiet_cmd_modules_install = INSTALL $@
 INSTALL_MOD_DIR ?= extra
 ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D))
 
-modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
+modinst_dir ?= $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 
 $(modules):
 	$(call cmd,modules_install,$(MODLIB)/$(modinst_dir))