On Tue, 2012-10-09 at 10:15 +0100, David Howells wrote: > Can you merge the following branch into the parisc tree please. > > This is to complete part of the UAPI disintegration for which the preparatory > patches were pulled recently. > > Now that the fixups and the asm-generic chunk have been merged, I've > regenerated the patches to get rid of those dependencies and to take account > of > any changes made so far in the merge window. If you have already pulled the > older version of the branch aimed at you, then please feel free to ignore this > request. > > The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
I'm getting a fairly massive merge failure over our misc tree: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc It looks like a conflict with the motion to using wrappered Kbuild for our asm-generic clones. James -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
