| To: | Dave Chinner <david@xxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: [GIT PULL] xfs: updates for 4.6-rc1 |
| From: | Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> |
| Date: | Mon, 21 Mar 2016 11:59:54 -0700 |
| Cc: | Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, xfs@xxxxxxxxxxx, Jan Kara <jack@xxxxxxx>, "Theodore Ts'o" <tytso@xxxxxxx> |
| Delivered-to: | xfs@xxxxxxxxxxx |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=WX14ZK+IfqNswwcLN9X1Q5CC5Xs35WtPkKw030O/xxs=; b=hVljjJtiBc0Vb8tHY7UzRYafti0bmlZzscH0Z/Yl+HKMu/3RQK0ALAEXTchMgA8W6p 7fX0lYm90dOdnSh5bBd+ky51ZPjHi1fdHHuP9HkqJb3BWkR2wY31ROdER7cRoUeNsSLL 6abOSr6Cz5uPOEvAtquFqOGpQVkyjl73cBSWzOeQN5VI3Dw/ISyXMzzCsnm82VplkeBU 1oSn1ainvFndY7wr7FkgX5rjQ0m66tGN+6RrLBKhrQR3AbuxS+CBdf1AqqQe6rx+K8OZ LdrG2zF0EPT6qit+NSpw/Wa/LA4z9y4noSp+jOAeaIrYE4hZKt7HpOgFj/yqhIendH/N VS+w== |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=WX14ZK+IfqNswwcLN9X1Q5CC5Xs35WtPkKw030O/xxs=; b=Z0dAz76tZUQAMC0bL27MjP3++sDTvDSGwZsNWPsAJrQ9efpxZ+6zQ9ryqNfG1FLQM8 peHgujDeY6h40fhZmcQaYunwL33SsqgYIgI8JWSlCoEAJSQ5IBSW1MbX3JfpslIa9oZl XA4WLME2PJ8isqvgzQHDx7zfQj1A+WCLCr3qE= |
| In-reply-to: | <20160321020505.GJ11812@dastard> |
| References: | <20160321020505.GJ11812@dastard> |
| Sender: | linus971@xxxxxxxxx |
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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [GIT PULL] xfs: updates for 4.6-rc1, Theodore Ts'o |
|---|---|
| Next by Date: | Re: [RFC PATCH 1/9] block: add block_device_operations methods to set and get reserved space, Dave Chinner |
| Previous by Thread: | Re: [GIT PULL] xfs: updates for 4.6-rc1, Theodore Ts'o |
| Next by Thread: | Re: [GIT PULL] xfs: updates for 4.6-rc1, Dave Chinner |
| Indexes: | [Date] [Thread] [Top] [All Lists] |