On Tue, Mar 29, 2011 at 12:37:25AM +1100, Stephen Rothwell wrote: > So does that mean that the whole xfs tree commit can be removed/ignored? > That is a bit of a pain to do in a merge (especially considering that > there is another commit in the xfs tree that changes that file. If the > whole commit is no longer needed, maybe it could be dropped from the xfs > tree or reverted. No, that change is just a small part of the commit. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html