lkml.org 
[lkml]   [2015]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm-current tree with the FIXME tree
Hi Andrew,

Today's linux-next merge of the akpm-current tree got conflicts in:

fs/ext3/super.c

between commit:

106542e7987c ("fs: Remove ext3 filesystem driver")

from the FIXME tree and commit:

d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4")

from the akpm-current tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

Jan, I also removed the JBD section from the MAINTAINERS file ... your
version has conflict markers left around it ...

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au


\
 
 \ /
  Last update: 2015-07-23 08:21    [W:0.051 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site