From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Jan Kara <jack@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexey Dobriyan <adobriyan@gmail.com>
Subject: linux-next: manual merge of the akpm-current tree with the FIXME tree
Date: Thu, 23 Jul 2015 16:00:48 +1000 [thread overview]
Message-ID: <20150723160048.01a283c5@canb.auug.org.au> (raw)
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
next reply other threads:[~2015-07-23 6:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 6:00 Stephen Rothwell [this message]
2015-07-23 6:02 ` linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2015-07-23 9:39 ` Jan Kara
-- strict thread matches above, loose matches on Subject: below --
2018-12-11 6:11 Stephen Rothwell
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=20150723160048.01a283c5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox