mirror of https://gitee.com/openkylin/linux.git
221bb8a46e
VGIC implementation. - s390: support for trapping software breakpoints, nested virtualization (vSIE), the STHYI opcode, initial extensions for CPU model support. - MIPS: support for MIPS64 hosts (32-bit guests only) and lots of cleanups, preliminary to this and the upcoming support for hardware virtualization extensions. - x86: support for execute-only mappings in nested EPT; reduced vmexit latency for TSC deadline timer (by about 30%) on Intel hosts; support for more than 255 vCPUs. - PPC: bugfixes. The ugly bit is the conflicts. A couple of them are simple conflicts due to 4.7 fixes, but most of them are with other trees. There was definitely too much reliance on Acked-by here. Some conflicts are for KVM patches where _I_ gave my Acked-by, but the worst are for this pull request's patches that touch files outside arch/*/kvm. KVM submaintainers should probably learn to synchronize better with arch maintainers, with the latter providing topic branches whenever possible instead of Acked-by. This is what we do with arch/x86. And I should learn to refuse pull requests when linux-next sends scary signals, even if that means that submaintainers have to rebase their branches. Anyhow, here's the list: - arch/x86/kvm/vmx.c: handle_pcommit and EXIT_REASON_PCOMMIT was removed by the nvdimm tree. This tree adds handle_preemption_timer and EXIT_REASON_PREEMPTION_TIMER at the same place. In general all mentions of pcommit have to go. There is also a conflict between a stable fix and this patch, where the stable fix removed the vmx_create_pml_buffer function and its call. - virt/kvm/kvm_main.c: kvm_cpu_notifier was removed by the hotplug tree. This tree adds kvm_io_bus_get_dev at the same place. - virt/kvm/arm/vgic.c: a few final bugfixes went into 4.7 before the file was completely removed for 4.8. - include/linux/irqchip/arm-gic-v3.h: this one is entirely our fault; this is a change that should have gone in through the irqchip tree and pulled by kvm-arm. I think I would have rejected this kvm-arm pull request. The KVM version is the right one, except that it lacks GITS_BASER_PAGES_SHIFT. - arch/powerpc: what a mess. For the idle_book3s.S conflict, the KVM tree is the right one; everything else is trivial. In this case I am not quite sure what went wrong. The commit that is causing the mess ( |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| con3215.c | ||
| con3270.c | ||
| ctrlchar.c | ||
| ctrlchar.h | ||
| defkeymap.c | ||
| defkeymap.map | ||
| diag_ftp.c | ||
| diag_ftp.h | ||
| fs3270.c | ||
| hmcdrv_cache.c | ||
| hmcdrv_cache.h | ||
| hmcdrv_dev.c | ||
| hmcdrv_dev.h | ||
| hmcdrv_ftp.c | ||
| hmcdrv_ftp.h | ||
| hmcdrv_mod.c | ||
| keyboard.c | ||
| keyboard.h | ||
| monreader.c | ||
| monwriter.c | ||
| raw3270.c | ||
| raw3270.h | ||
| sclp.c | ||
| sclp.h | ||
| sclp_async.c | ||
| sclp_cmd.c | ||
| sclp_con.c | ||
| sclp_config.c | ||
| sclp_cpi_sys.c | ||
| sclp_cpi_sys.h | ||
| sclp_ctl.c | ||
| sclp_diag.h | ||
| sclp_early.c | ||
| sclp_ftp.c | ||
| sclp_ftp.h | ||
| sclp_ocf.c | ||
| sclp_pci.c | ||
| sclp_quiesce.c | ||
| sclp_rw.c | ||
| sclp_rw.h | ||
| sclp_sdias.c | ||
| sclp_sdias.h | ||
| sclp_tty.c | ||
| sclp_tty.h | ||
| sclp_vt220.c | ||
| tape.h | ||
| tape_34xx.c | ||
| tape_3590.c | ||
| tape_3590.h | ||
| tape_char.c | ||
| tape_class.c | ||
| tape_class.h | ||
| tape_core.c | ||
| tape_proc.c | ||
| tape_std.c | ||
| tape_std.h | ||
| tty3270.c | ||
| tty3270.h | ||
| vmcp.c | ||
| vmcp.h | ||
| vmlogrdr.c | ||
| vmur.c | ||
| vmur.h | ||
| zcore.c | ||