* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (1829 commits) Conflicts: arch/mips/include/uapi/asm/Kbuild arch/powerpc/include/uapi/asm/Kbuild drivers/irqchip/irq-gic.c drivers/scsi/ufs/ufs_quirks.h drivers/scsi/ufs/ufshcd.c drivers/usb/dwc3/core.c drivers/usb/gadget/function/f_accessory.c fs/ext4/namei.c include/uapi/drm/Kbuild include/uapi/linux/Kbuild include/uapi/linux/cifs/Kbuild include/uapi/linux/genwqe/Kbuild mm/page_alloc.c net/ipv6/datagram.c net/netfilter/xt_quota2.c net/netlink/genetlink.c sound/core/compress_offload.c Change-Id: I42de3248e9c43e504df5c9bb4139cbf355d2d7de