mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00: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 ( |
||
|---|---|---|
| .. | ||
| 9p.h | ||
| asoc.h | ||
| bcache.h | ||
| block.h | ||
| btrfs.h | ||
| clk.h | ||
| cma.h | ||
| compaction.h | ||
| context_tracking.h | ||
| cpuhp.h | ||
| devlink.h | ||
| ext4.h | ||
| f2fs.h | ||
| fence.h | ||
| fib6.h | ||
| fib.h | ||
| filelock.h | ||
| filemap.h | ||
| gpio.h | ||
| host1x.h | ||
| hswadsp.h | ||
| huge_memory.h | ||
| i2c.h | ||
| intel-sst.h | ||
| iommu.h | ||
| ipi.h | ||
| irq.h | ||
| jbd2.h | ||
| kmem.h | ||
| kvm.h | ||
| libata.h | ||
| lock.h | ||
| mce.h | ||
| migrate.h | ||
| mmc.h | ||
| mmflags.h | ||
| module.h | ||
| napi.h | ||
| net.h | ||
| nilfs2.h | ||
| nmi.h | ||
| oom.h | ||
| page_isolation.h | ||
| page_ref.h | ||
| pagemap.h | ||
| power_cpu_migrate.h | ||
| power.h | ||
| printk.h | ||
| random.h | ||
| rcu.h | ||
| regulator.h | ||
| rpm.h | ||
| sched.h | ||
| scsi.h | ||
| signal.h | ||
| skb.h | ||
| sock.h | ||
| spi.h | ||
| spmi.h | ||
| sunrpc.h | ||
| sunvnet.h | ||
| swiotlb.h | ||
| syscalls.h | ||
| target.h | ||
| task.h | ||
| thermal_power_allocator.h | ||
| thermal.h | ||
| thp.h | ||
| timer.h | ||
| tlb.h | ||
| udp.h | ||
| v4l2.h | ||
| vb2.h | ||
| vmscan.h | ||
| workqueue.h | ||
| writeback.h | ||
| xen.h | ||