[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20160516204731.GN7799@thunk.org>
Date: Mon, 16 May 2016 16:47:31 -0400
From: Theodore Ts'o <tytso@....edu>
To: Jan Kara <jack@...e.cz>
Cc: Dan Williams <dan.j.williams@...el.com>,
linux-ext4 <linux-ext4@...r.kernel.org>,
linux-nvdimm <linux-nvdimm@...1.01.org>,
Vishal Verma <vishal.l.verma@...el.com>,
Ross Zwisler <ross.zwisler@...ux.intel.com>,
linux-fsdevel <linux-fsdevel@...r.kernel.org>
Subject: Re: [PATCH 0/4] ext4: DAX fixes
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
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists