Messages in this thread | | | Date | Tue, 14 Feb 2012 11:54:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with Linus' tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging: pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit 044ff9e29029 ("switch open-coded instances of d_make_root() to new helper") from the vfs tree.
The former just removes this file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |