it would probably be a good thing for Linus to not merge either of them prior to the kernel summit, let discussions take place there, and then merge the set decided on in that discussion. It won't be the first time that Linus has held off on pulling a substantial patchset until -rc2, and the face-to-face discussion is worth a lot.