On Sun, Mar 20, 2016 at 7:05 PM, Dave Chinner <david@xxxxxxxxxxxxx> wrote: > > There are conflicts with the ext4 code that has already been merged > this cycle. The merge looked pretty straightforward, but both of you (ie both the xfs and ext4 people, please) should check the end result please. My sanity-check is still building, but it should be all pushed out in another 15 minutes or so. Linus _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs