* 'android-msm-pixel-4.14':
UPSTREAM: net: inet: do not leave a dangling sk pointer in inet_create()
UPSTREAM: kdb: use __ktime_get_real_seconds instead of __current_kernel_time
locking/barriers: Introduce smp_cond_load_relaxed() and atomic_cond_read_relaxed()
iio: power: pac193x: Use proper clock specifier names in functions
UPSTREAM: seccomp, bpf: disable preemption before calling into bpf prog
BACKPORT: bpf: Fix 32 bit src register truncation on div/mod
BACKPORT: perf, bpf: Introduce PERF_RECORD_BPF_EVENT
UPSTREAM: perf, bpf: Introduce PERF_RECORD_KSYMBOL
UPSTREAM: bpf: BPF_PROG_TYPE_CGROUP_{SKB, SOCK, SOCK_ADDR} require cgroups enabled
UPSTREAM: net: bpfilter: disallow to remove bpfilter module while being used
UPSTREAM: net: bpfilter: restart bpfilter_umh when error occurred
UPSTREAM: net: bpfilter: use cleanup callback to release umh_info
UPSTREAM: signal/bpfilter: Fix bpfilter_kernl to use send_sig not force_sig
UPSTREAM: net: bpfilter: use get_pid_task instead of pid_task
UPSTREAM: net: bpfilter: Fix type cast and pointer warnings
BACKPORT: bpfilter: include bpfilter_umh in assembly instead of using objcopy
UPSTREAM: bpfilter: fix race in pipe access
UPSTREAM: bpfilter: fix building without CONFIG_INET
BACKPORT: umh: add exit routine for UMH process
UPSTREAM: umh: fix race condition
...
Conflicts:
Makefile
Change-Id: I1a03d49f21b2f18779eb498a9aeacef76fcbb12d
659c26dfbc