On Mon, Apr 21, 2014 at 09:19:19PM -0400, Theodore Ts'o wrote:
> On Tue, Apr 22, 2014 at 11:04:59AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the vfs tree got a conflict in
> > fs/ext4/extents.c between rebased versions of commits from Linus' and the
> > ext4 trees and the
On Tue, Apr 22, 2014 at 11:04:59AM +1000, Stephen Rothwell wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/ext4/extents.c between rebased versions of commits from Linus' and the
> ext4 trees and the same commits from the vfs tree.
>
> I fixed it up (I just used the vers
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/extents.c between rebased versions of commits from Linus' and the
ext4 trees and the same commits from the vfs tree.
I fixed it up (I just used the version from Linus' and the ext4 trees)
and can carry the fix as necessary
3 matches
Mail list logo
