There's a trivial (and amusing) conflict with KVM s390 in the selftests pull request (we both added "config" to the .gitignore, within a few days of each other, after the goof being around for a good year or more). Note, the pull requests are relative to v6.11-rc4. I got a late start, and for some reason thought kvm/next would magically end up on rc4 or later. Note #2, I had a brainfart and put the testcase for verifying KVM's fastpath correctly exits to userspace when needed in selftests, whereas the actual KVM fix is in misc. So if you run KVM selftests in the middle of pulling everything, expect the debug_regs test to fail.
