From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>,
Konstantin Khebnikov <khlebnikov@yandex-team.ru>
Subject: linux-next: manual merge of the akpm-current tree with the block tree
Date: Wed, 21 Jan 2015 18:14:50 +1100 [thread overview]
Message-ID: <20150121181450.743c625b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in
mm/filemap.c and mm/truncate.c between commit de1414a654e6 ("fs: export
inode_to_bdi and use it in favor of mapping->backing_dev_info") from
the tree and commit d475bc581640 ("page_writeback: cleanup mess around
cancel_dirty_page()") from the akpm-current tree.
I fixed it up (the latter removed the code modified by the former) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-21 7:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-21 7:14 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-02 5:40 linux-next: manual merge of the akpm-current tree with the block tree Stephen Rothwell
2021-04-07 9:18 Stephen Rothwell
2021-03-18 6:17 Stephen Rothwell
2021-03-18 17:54 ` Shakeel Butt
2021-03-18 18:19 ` Jens Axboe
2020-11-17 5:05 Stephen Rothwell
2020-10-15 6:27 Stephen Rothwell
2020-09-25 9:57 Stephen Rothwell
2019-05-03 9:10 Stephen Rothwell
2019-05-03 12:35 ` Amir Goldstein
2018-10-02 7:21 Stephen Rothwell
2018-08-13 7:51 Stephen Rothwell
2018-08-02 8:31 Stephen Rothwell
2018-03-19 6:36 Stephen Rothwell
2016-07-13 6:14 Stephen Rothwell
2016-07-13 16:31 ` Jens Axboe
2015-12-07 8:12 Stephen Rothwell
2015-12-07 19:44 ` Andrew Morton
2015-12-07 20:24 ` Stephen Rothwell
2015-11-01 15:51 Stephen Rothwell
2015-11-01 16:04 ` kbuild test robot
2015-11-01 16:05 ` kbuild test robot
2015-11-01 18:38 ` Mel Gorman
2015-11-01 21:51 ` Stephen Rothwell
2014-07-02 6:06 Stephen Rothwell
2013-11-05 6:29 Stephen Rothwell
2013-11-05 6:25 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=20150121181450.743c625b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=khlebnikov@yandex-team.ru \
--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;
as well as URLs for NNTP newsgroup(s).