On Sat, Jun 30, 2012 at 01:34:28PM +0100, Jonathan Cameron wrote: > Hi Greg, > > I'm afraid I'm not that familiar with the complexities > of pull requests. What does one do as here if the patches > are dependent on fixes in a separate series? I merged > in the fixes-togreg branch before applying these. > > What is the standard way of handling this? Don't do the merge. I can easily do it if it's needed (here it wasn't as I ended up pulling both into the -next branch.) Don't do merges at all, let me do them, that makes things "cleaner" and keeps the history easier to follow and is generally nicer. I would rather there be conflicts and figure them out and fix them, than have you have to do them (although help in figuring them out is always appreciated.) Oh, and a signed tag would be great as mentioned before. I've pulled and pushed this, and the other pull request out. Hopefully it made things easier for you, it sure made things easier for me :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
