Messages in this thread | | | Date | Mon, 21 Mar 2016 11:59:54 -0700 | Subject | Re: [GIT PULL] xfs: updates for 4.6-rc1 | From | Linus Torvalds <> |
| |
On Sun, Mar 20, 2016 at 7:05 PM, Dave Chinner <david@fromorbit.com> 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
| |