mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
Conflicts: Documentation/arm64/silicon-errata.txt arch/arm/Makefile arch/arm/configs/ranchu_defconfig arch/arm64/Kconfig arch/arm64/configs/ranchu64_defconfig arch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/cputype.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/setup.c arch/arm64/kvm/hyp/switch.c arch/arm64/mm/mmu.c arch/arm64/mm/proc.S arch/x86/Makefile arch/x86/configs/i386_ranchu_defconfig arch/x86/configs/x86_64_ranchu_defconfig drivers/char/Kconfig drivers/clk/clk.c drivers/clk/qcom/clk-rcg2.c drivers/devfreq/devfreq.c drivers/gpu/drm/msm/msm_drv.c drivers/mailbox/mailbox.c drivers/md/dm-verity-target.c drivers/media/dvb-core/dmxdev.c drivers/mmc/core/block.c drivers/mmc/core/core.c drivers/mmc/core/host.c drivers/mmc/core/mmc.c drivers/mmc/core/mmc_ops.c drivers/mmc/core/queue.c drivers/mmc/host/sdhci-msm.c drivers/mmc/host/sdhci.c drivers/mtd/ubi/wl.c drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c drivers/rpmsg/qcom_glink_native.c drivers/scsi/ufs/ufs-qcom.c drivers/scsi/ufs/ufshcd.c drivers/soc/qcom/smp2p.c drivers/staging/android/ion/ion.c drivers/thermal/thermal_core.c drivers/tty/tty_jobctrl.c drivers/usb/core/hub.c drivers/usb/core/quirks.c drivers/usb/dwc3/core.c drivers/usb/dwc3/gadget.c drivers/usb/gadget/composite.c drivers/usb/gadget/function/f_accessory.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_uac1.c drivers/usb/gadget/function/f_uac2.c drivers/usb/gadget/legacy/dbgp.c drivers/usb/gadget/legacy/inode.c drivers/usb/host/xhci.c drivers/usb/host/xhci.h fs/fat/fatent.c fs/incfs/main.c include/linux/usb/usbnet.h include/net/pkt_sched.h include/net/sock.h include/uapi/linux/virtio_ids.h kernel/cpu.c kernel/panic.c kernel/sched/cpufreq_schedutil.c kernel/sched/fair.c lib/ubsan.h net/core/skbuff.c net/ipv4/inet_connection_sock.c net/qrtr/qrtr.c net/sctp/input.c scripts/checkpatch.pl security/selinux/avc.c Change-Id: I3df6e75af6716bc6df4831d41ffd60680832ef66 Signed-off-by: Alexander Winkowski <dereference23@outlook.com>