mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-01 08:34:01 +08:00
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 ( |
||
|---|---|---|
| .. | ||
| probes | ||
| vdso | ||
| .gitignore | ||
| acpi_numa.c | ||
| acpi_parking_protocol.c | ||
| acpi.c | ||
| alternative.c | ||
| arm64ksyms.c | ||
| armv8_deprecated.c | ||
| asm-offsets.c | ||
| cacheinfo.c | ||
| cpu_errata.c | ||
| cpu_ops.c | ||
| cpu-reset.h | ||
| cpu-reset.S | ||
| cpufeature.c | ||
| cpuidle.c | ||
| cpuinfo.c | ||
| debug-monitors.c | ||
| efi-entry.S | ||
| efi.c | ||
| entry32.S | ||
| entry-fpsimd.S | ||
| entry-ftrace.S | ||
| entry.S | ||
| fpsimd.c | ||
| ftrace.c | ||
| head.S | ||
| hibernate-asm.S | ||
| hibernate.c | ||
| hw_breakpoint.c | ||
| hyp-stub.S | ||
| image.h | ||
| insn.c | ||
| io.c | ||
| irq.c | ||
| jump_label.c | ||
| kaslr.c | ||
| kgdb.c | ||
| kuser32.S | ||
| machine_kexec.c | ||
| Makefile | ||
| module-plts.c | ||
| module.c | ||
| module.lds | ||
| paravirt.c | ||
| pci.c | ||
| perf_callchain.c | ||
| perf_event.c | ||
| perf_regs.c | ||
| process.c | ||
| psci.c | ||
| ptrace.c | ||
| relocate_kernel.S | ||
| return_address.c | ||
| setup.c | ||
| signal32.c | ||
| signal.c | ||
| sleep.S | ||
| smccc-call.S | ||
| smp_spin_table.c | ||
| smp.c | ||
| stacktrace.c | ||
| suspend.c | ||
| sys32.c | ||
| sys_compat.c | ||
| sys.c | ||
| time.c | ||
| topology.c | ||
| trace-events-emulation.h | ||
| traps.c | ||
| vdso.c | ||
| vmlinux.lds.S | ||