OSDN Git Service

Merge tag 'v4.18.14' into kernel-4.18
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 16 Oct 2018 06:20:01 +0000 (14:20 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 16 Oct 2018 06:20:01 +0000 (14:20 +0800)
commit9ebcb4601d16c713357b9df14984489bd1fe0003
tree4429d8b4aa9f7686df721ce4ccaa62493cf1dca7
parent60182d4261ee3ac9eac5523a18f30f67f01b45b8
parente7d199e92956587695510d147c8de795f944cec9
Merge tag 'v4.18.14' into kernel-4.18

Conflicts:
drivers/base/power/main.c
19 files changed:
Makefile
arch/x86/entry/vdso/Makefile
drivers/base/power/main.c
drivers/firmware/arm_scmi/perf.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/hid/hid-ids.h
drivers/mmc/core/host.c
fs/inode.c
fs/proc/base.c
fs/pstore/ram.c
fs/xattr.c
include/linux/fs.h
include/linux/mm.h
kernel/events/core.c
kernel/sched/topology.c
mm/madvise.c
net/netfilter/Kconfig
net/wireless/nl80211.c
sound/pci/hda/patch_realtek.c