linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>
Subject: linux-next: manual merge of the akpm tree with the block tree
Date: Wed, 21 Jan 2015 18:46:06 +1100	[thread overview]
Message-ID: <20150121184606.214150de@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/filemap_xip.c between commit de1414a654e6 ("fs: export inode_to_bdi
and use it in favor of mapping->backing_dev_info") from the block tree
and commit cd5ca6e1eb43 ("dax,ext2: replace XIP read and write with DAX
I/O") from the akpm 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 --]

             reply	other threads:[~2015-01-21  7:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-21  7:46 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-02-03  4:53 linux-next: manual merge of the akpm tree with the block tree Stephen Rothwell
2013-04-30  6:02 Stephen Rothwell
2013-03-26  5:33 Stephen Rothwell
2013-03-26  5:25 Stephen Rothwell
2013-03-26  5:11 Stephen Rothwell
2013-01-15  3:10 Stephen Rothwell
2013-01-14  3:58 Stephen Rothwell
2013-01-15 14:33 ` Asai Thambi S P
2012-11-12  4:15 Stephen Rothwell
2012-11-12 21:07 ` Andrew Morton
2012-11-12 21:20   ` Jens Axboe
2012-11-12 21:29     ` Andrew Morton
2012-11-12 21:30       ` Jens Axboe
2011-10-25  9:07 Stephen Rothwell
2011-10-25 18:20 ` Mike Miller

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=20150121184606.214150de@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --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).