Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

* android-4.4: (3220 commits)
  ANDROID: Communicates LMK events to userland where they can be logged
  Linux 4.4.179
  kernel/sysctl.c: fix out-of-bounds access when setting file-max
  Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
  ALSA: info: Fix racy addition/deletion of nodes
  mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
  device_cgroup: fix RCU imbalance in error case
  sched/fair: Limit sched_cfs_period_timer() loop to avoid hard lockup
  Revert "kbuild: use -Oz instead of -Os when using clang"
  mac80211: do not call driver wake_tx_queue op during reconfig
  kprobes: Fix error check when reusing optimized probes
  kprobes: Mark ftrace mcount handler functions nokprobe
  x86/kprobes: Verify stack frame on kretprobe
  arm64: futex: Restore oldval initialization to work around buggy compilers
  crypto: x86/poly1305 - fix overflow during partial reduction
  ALSA: core: Fix card races between register and disconnect
  staging: comedi: ni_usb6501: Fix possible double-free of ->usb_rx_buf
  staging: comedi: ni_usb6501: Fix use of uninitialized mutex
  staging: comedi: vmk80xx: Fix possible double-free of ->usb_rx_buf
  staging: comedi: vmk80xx: Fix use of uninitialized semaphore
  ...

Conflicts:
	Documentation/arm64/silicon-errata.txt
	Documentation/kernel-parameters.txt
	Makefile
	arch/arm/Kconfig
	arch/arm/configs/ranchu_defconfig
	arch/arm64/Kconfig
	arch/arm64/Makefile
	arch/arm64/configs/cuttlefish_defconfig
	arch/arm64/configs/ranchu64_defconfig
	arch/arm64/include/asm/cacheflush.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/cputype.h
	arch/arm64/include/asm/hardirq.h
	arch/arm64/include/asm/kvm_host.h
	arch/arm64/include/asm/module.h
	arch/arm64/include/asm/pgtable.h
	arch/arm64/include/asm/smp.h
	arch/arm64/include/asm/spinlock.h
	arch/arm64/include/asm/suspend.h
	arch/arm64/include/asm/sysreg.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/arm64ksyms.c
	arch/arm64/kernel/asm-offsets.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/efi-entry.S
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/head.S
	arch/arm64/kernel/image.h
	arch/arm64/kernel/module-plts.c
	arch/arm64/kernel/module.c
	arch/arm64/kernel/module.lds
	arch/arm64/kernel/process.c
	arch/arm64/kernel/stacktrace.c
	arch/arm64/kernel/suspend.c
	arch/arm64/kernel/traps.c
	arch/arm64/kernel/vmlinux.lds.S
	arch/arm64/kvm/hyp.S
	arch/arm64/kvm/hyp/fpsimd.S
	arch/arm64/mm/dma-mapping.c
	arch/arm64/mm/fault.c
	arch/arm64/mm/hugetlbpage.c
	arch/arm64/mm/init.c
	arch/arm64/mm/mmu.c
	arch/arm64/mm/pageattr.c
	arch/arm64/mm/proc.S
	arch/x86/configs/i386_ranchu_defconfig
	arch/x86/configs/x86_64_cuttlefish_defconfig
	arch/x86/configs/x86_64_ranchu_defconfig
	arch/x86/entry/vdso/Makefile
	arch/x86/include/asm/thread_info.h
	arch/x86/include/asm/uaccess.h
	arch/x86/include/asm/uaccess_32.h
	arch/x86/include/asm/uaccess_64.h
	build.config.cuttlefish.aarch64
	build.config.cuttlefish.x86_64
	drivers/Kconfig
	drivers/Makefile
	drivers/android/Kconfig
	drivers/android/binder.c
	drivers/block/loop.c
	drivers/cpufreq/cpufreq-dt.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/firmware/Kconfig
	drivers/firmware/efi/libstub/Makefile
	drivers/firmware/efi/libstub/arm64-stub.c
	drivers/firmware/psci.c
	drivers/gpu/drm/rockchip/rockchip_drm_drv.c
	drivers/hwtracing/coresight/coresight-etm4x.c
	drivers/hwtracing/coresight/coresight-funnel.c
	drivers/hwtracing/coresight/coresight-tmc.c
	drivers/hwtracing/coresight/coresight-tpiu.c
	drivers/hwtracing/stm/Kconfig
	drivers/hwtracing/stm/core.c
	drivers/irqchip/Kconfig
	drivers/md/Kconfig
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/uid_sys_stats.c
	drivers/mmc/core/mmc.c
	drivers/net/ethernet/realtek/r8169.c
	drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
	drivers/net/wireless/virt_wifi.c
	drivers/platform/goldfish/goldfish_pipe_v2.c
	drivers/staging/android/fiq_debugger/Kconfig
	drivers/switch/Kconfig
	drivers/switch/Makefile
	drivers/switch/switch_class.c
	drivers/tee/optee/rpc.c
	drivers/tee/optee/shm_pool.h
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_audio_source.c
	drivers/usb/gadget/function/f_mtp.c
	drivers/usb/gadget/function/u_ether.c
	drivers/usb/host/xhci-ring.c
	fs/exec.c
	fs/pnode.c
	include/linux/cpufreq.h
	include/linux/dcache.h
	include/linux/memblock.h
	include/linux/power/bq25700-charge.h
	include/linux/uid_stat.h
	include/net/activity_stats.h
	include/uapi/linux/android/binder.h
	kernel/events/ring_buffer.c
	kernel/sched/fair.c
	kernel/time/timer.c
	mm/memblock.c
	mm/slab.c
	net/ipv4/tcp_ipv4.c
	net/socket.c
	scripts/dtc/checks.c
	scripts/dtc/dtc-lexer.lex.c_shipped
	scripts/dtc/dtc-parser.tab.c_shipped
	scripts/dtc/dtc.c
	scripts/dtc/dtc.h
	scripts/dtc/dtx_diff
	scripts/dtc/libfdt/fdt_wip.c
	scripts/dtc/libfdt/libfdt.h
	scripts/dtc/livetree.c
	scripts/dtc/srcpos.h
	scripts/dtc/util.h
	scripts/dtc/version_gen.h
	scripts/sortextable.c

Change-Id: Ic327e4bbeb99e98724bb626fa9df2d31b0abc003

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index 0c161ed6d18e..8205b456de7a 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -143,7 +143,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr,
 	int ret;
 
         ret = get_user_pages(current, current->mm, virt_addr,
-                        1, VM_READ, 0, NULL, NULL);
+			     1, FOLL_WRITE, NULL, NULL);
 	if (ret<=0) {
 #ifdef ERR_INJ_DEBUG
 		printk("Virtual address %lx is not existing.\n",virt_addr);