From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jens Axboe <axboe@kernel•dk>,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the akpm-current tree with the tree
Date: Wed, 21 Jan 2015 18:14:25 +1100 [thread overview]
Message-ID: <20150121181425.18399e35@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/swap.c between commit 97b713ba3eba ("fs: kill BDI_CAP_SWAP_BACKED")
from the block tree and commit f69ec11fad9f ("rmap: drop support of
non-linear mappings") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc mm/swap.c
index 4e0109a2f37b,5b3087228b99..000000000000
--- a/mm/swap.c
+++ b/mm/swap.c
@@@ -1138,10 -1138,10 +1138,8 @@@ void __init swap_setup(void
#ifdef CONFIG_SWAP
int i;
- for (i = 0; i < MAX_SWAPFILES; i++) {
- if (bdi_init(swapper_spaces[0].backing_dev_info))
- panic("Failed to init swap bdi");
+ for (i = 0; i < MAX_SWAPFILES; i++)
spin_lock_init(&swapper_spaces[i].tree_lock);
- INIT_LIST_HEAD(&swapper_spaces[i].i_mmap_nonlinear);
- }
#endif
/* Use a smaller cluster for small-memory machines */
[-- 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: 7+ 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 --
2015-12-03 0:23 linux-next: manual merge of the akpm-current tree with the tree Mark Brown
2014-09-03 16:23 Mark Brown
2014-09-01 22:54 Mark Brown
2014-05-29 9:04 Stephen Rothwell
2013-02-22 3:46 Stephen Rothwell
2012-11-15 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=20150121181425.18399e35@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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