[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFy4NNR+VUD=KpLE=vMz22xrQ7E5J8A_B-Pf4Hj8GjBVFQ@mail.gmail.com>
Date: Mon, 21 Mar 2016 11:59:54 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Dave Chinner <david@...morbit.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
xfs@....sgi.com, Jan Kara <jack@...e.cz>,
"Theodore Ts'o" <tytso@....edu>
Subject: Re: [GIT PULL] xfs: updates for 4.6-rc1
On Sun, Mar 20, 2016 at 7:05 PM, Dave Chinner <david@...morbit.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
Powered by blists - more mailing lists