Messages in this thread | | | Date | Tue, 22 Mar 2016 09:40:57 +1100 | From | Dave Chinner <> | Subject | Re: [GIT PULL] xfs: updates for 4.6-rc1 |
| |
On Mon, Mar 21, 2016 at 11:59:54AM -0700, Linus Torvalds wrote: > 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.
Merged XFS bits look fine, ext4 parts look ok according to Jan's last comments.
Cheers,
Dave. -- Dave Chinner david@fromorbit.com
| |