From: Dave Chinner <david@fromorbit.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Theodore Ts'o <tytso@mit.edu>,
Andrew Morton <akpm@linux-foundation.org>,
Jan Kara <jack@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
xfs@oss.sgi.com
Subject: Re: [GIT PULL] xfs: updates for 4.6-rc1
Date: Tue, 22 Mar 2016 09:40:57 +1100 [thread overview]
Message-ID: <20160321224057.GO11812@dastard> (raw)
In-Reply-To: <CA+55aFy4NNR+VUD=KpLE=vMz22xrQ7E5J8A_B-Pf4Hj8GjBVFQ@mail.gmail.com>
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2016-03-21 22:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 2:05 [GIT PULL] xfs: updates for 4.6-rc1 Dave Chinner
2016-03-21 9:16 ` Jan Kara
2016-03-21 18:34 ` Theodore Ts'o
2016-03-21 18:59 ` Linus Torvalds
2016-03-21 22:40 ` Dave Chinner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160321224057.GO11812@dastard \
--to=david@fromorbit.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox