Messages in this thread | | | Date | Tue, 13 Aug 2013 11:33:33 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the ext4 tree with Linus' tree |
| |
Hi Theodore,
Today's linux-next merge of the ext4 tree got a conflict in fs/ext4/ioctl.c between commit cde2d7a796f7 ("ext4: flush the extent status cache during EXT4_IOC_SWAP_BOOT") from Linus' tree and commit 0dee1a241030 ("ext4: swap all the extent_status LRU fields during EXT4_IOC_SWAP_BOOT") from the ext4 tree.
I fixed it up (I guessed that the ext4 tree version is a better fix(?) so used that) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |