All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Ts'o <tytso@mit.edu>
To: Jan Kara <jack@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>,
	linux-ext4 <linux-ext4@vger.kernel.org>,
	linux-nvdimm <linux-nvdimm@ml01.01.org>,
	Vishal Verma <vishal.l.verma@intel.com>,
	Ross Zwisler <ross.zwisler@linux.intel.com>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 0/4] ext4: DAX fixes
Date: Mon, 16 May 2016 16:47:31 -0400	[thread overview]
Message-ID: <20160516204731.GN7799@thunk.org> (raw)
In-Reply-To: <20160516155950.GF21714@quack2.suse.cz>

On Mon, May 16, 2016 at 05:59:50PM +0200, Jan Kara wrote:
> The patch which fixes ext4 behavior is attached. Just that we know what we
> are speaking about... Rebasing all the patches on top of this is trivial
> (git rebase just handles the conflict automatically).

OK, I've added this one-liner to the ext4 tree.  I presume that if git
rebase handles the conflict automatically, git merge should be able to
handle automatically it as well.

					- Ted

      parent reply	other threads:[~2016-05-16 20:47 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-11  9:39 [PATCH 0/4] ext4: DAX fixes Jan Kara
2016-05-11  9:39 ` Jan Kara
2016-05-11  9:39 ` [PATCH 1/4] ext4: Handle transient ENOSPC properly for DAX Jan Kara
2016-05-11  9:39   ` Jan Kara
2016-05-11  9:39 ` [PATCH 2/4] ext4: Fix race in transient ENOSPC detection Jan Kara
2016-05-11  9:39   ` Jan Kara
2016-05-11  9:39 ` [PATCH 3/4] ext4: Refactor direct IO code Jan Kara
2016-05-11  9:39   ` Jan Kara
2016-05-11  9:39 ` [PATCH 4/4] ext4: Pre-zero allocated blocks for DAX IO Jan Kara
2016-05-11  9:39   ` Jan Kara
2016-05-13  5:24 ` [PATCH 0/4] ext4: DAX fixes Theodore Ts'o
2016-05-13 13:56   ` Theodore Ts'o
2016-05-16  9:35     ` Jan Kara
2016-05-16 14:26       ` Jan Kara
2016-05-16 15:08         ` Theodore Ts'o
2016-05-16 15:13           ` Dan Williams
2016-05-16 15:59             ` Jan Kara
2016-05-16 18:29               ` Dan Williams
2016-05-16 20:47               ` Theodore Ts'o [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=20160516204731.GN7799@thunk.org \
    --to=tytso@mit.edu \
    --cc=dan.j.williams@intel.com \
    --cc=jack@suse.cz \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nvdimm@ml01.01.org \
    --cc=ross.zwisler@linux.intel.com \
    --cc=vishal.l.verma@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.