On Wed, 25 Jul 2012 08:38:36 +1000 Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> wrote: > > On Tue, 2012-07-24 at 12:04 -0700, Linus Torvalds wrote: > > Ok, this caused conflicts with the s390 and ppc trees. I think I fixed > > them correctly, but the respective arch people really should take a > > look. > > A quick peek at the merge commit looks allright, but Alex mentioned that > there's some more fallover that needs an actual patch to fix (the > changes to enforce a cleaner ASM syntax need to be applied to some new > code from Avi's tree that didn't actually trigger merge conflicts). > > I'll follow up with Alex and send you the relevant patches if any. There was at least one, but Linus got it (I checked all the mentions of VCPU_GPR). His merge resolution matches the one that has been in linux-next for quite some time. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpwREOjJAlck.pgp
Description: PGP signature
