In this case there were 2 files with a potential conflict
(buffer.c and filemap.c).
No actual conflicts, but I thought it good manners to
pull the tree and resolve any potential conflicts myself,
instead of burdening Linus with the job.
-- "Linux holds advantages over the single-vendor commercial OS" -- Microsoft's "Competing with Linux" document
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to email@example.com More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/