Hi Avi, Today's linux-next merge of the kvm tree got conflicts in about 23 files. This has happened because only a subset of the kvm tree that is merged into the linux-next tree has been merged into Linus' tree *and* that subset was rebased before the merge happened. I have dropped the kvm tree. Is there some other branch that I should be including in linux-next instead of the current one i.e. something that represents what you will actually send to Linus that doesn't need to be rebased before that happens? -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpy4mlofHCS4.pgp
Description: PGP signature
