Hi all, The following commit is also in Linus Torvalds' tree as a different commit (but the same patch): 53ad50232e9f ("fuse: keep inode->i_blkbits constant") This is commit 542ede096e48 ("fuse: keep inode->i_blkbits constant") in Linus' tree. This duplication is causing an unnecessary conflict in the merge of the fuse tree. -- Cheers, Stephen Rothwell