From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>,
Nathan Zimmer <nzimmer@sgi.com>
Subject: linux-next: manual merge of the akpm tree with the vfs tree
Date: Thu, 4 Apr 2013 17:26:48 +1100 [thread overview]
Message-ID: <20130404172648.27834d12cbb68338f4b89482@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
"procfs: improve scaling in proc" from the akpm tree.
I just dropped the akpm tree patch (and the following
"procfs-improve-scaling-in-proc-v5") as the conflicts are a bit complex.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-04 6:26 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-04 6:26 Stephen Rothwell [this message]
2013-04-04 6:56 ` linux-next: manual merge of the akpm tree with the vfs tree Andrew Morton
2013-04-04 7:02 ` Andrew Morton
2013-04-04 8:10 ` Al Viro
2013-04-04 23:18 ` Stephen Rothwell
2013-04-04 8:02 ` Al Viro
2013-04-04 15:43 ` Nathan Zimmer
2013-04-04 15:53 ` [PATCH resend] fs/proc: Move kfree outside pde_unload_lock Nathan Zimmer
2013-04-04 16:11 ` Al Viro
2013-04-04 17:12 ` Nathan Zimmer
2013-04-04 20:44 ` Al Viro
2013-04-05 17:05 ` Nathan Zimmer
2013-04-05 17:36 ` Al Viro
2013-04-05 20:56 ` Nathan Zimmer
2013-04-05 21:00 ` Al Viro
2013-04-08 15:34 ` Nathan Zimmer
2013-04-08 15:58 ` Al Viro
2013-04-08 16:42 ` Nathan Zimmer
2013-04-08 20:52 ` Nathan Zimmer
2013-04-08 21:23 ` Al Viro
2013-04-08 21:48 ` hangs on boot in 9984d7394618df9 Al Viro
2013-04-08 22:17 ` Stephen Warren
2013-04-08 22:45 ` Doug Anderson
2013-04-08 23:06 ` Al Viro
2013-04-08 23:20 ` Stephen Warren
2013-04-08 23:46 ` Doug Anderson
2013-04-09 17:12 ` Nathan Zimmer
2013-04-08 22:46 ` Al Viro
2013-04-08 22:57 ` Al Viro
2013-04-08 21:56 ` [PATCH resend] fs/proc: Move kfree outside pde_unload_lock Nathan Zimmer
-- strict thread matches above, loose matches on Subject: below --
2020-05-15 11:33 linux-next: manual merge of the akpm tree with the vfs tree Stephen Rothwell
2019-04-11 6:21 Stephen Rothwell
2018-05-17 6:36 Stephen Rothwell
2018-01-02 6:46 Stephen Rothwell
2016-12-12 5:52 Stephen Rothwell
2016-12-12 8:14 ` Ian Kent
2014-08-08 6:20 Stephen Rothwell
2013-09-10 4:41 Stephen Rothwell
2013-09-05 8:56 Stephen Rothwell
2013-04-30 5:54 Stephen Rothwell
2013-04-29 8:34 Stephen Rothwell
2013-04-29 8:25 Stephen Rothwell
2013-04-04 6:17 Stephen Rothwell
2013-04-04 6:12 Stephen Rothwell
2013-04-04 12:33 ` Jan Kara
2013-04-04 6:04 Stephen Rothwell
2013-02-25 3:40 Stephen Rothwell
2012-09-24 13:40 Stephen Rothwell
2012-09-24 13:12 Stephen Rothwell
2012-09-24 13:06 Stephen Rothwell
2012-07-22 5:44 Stephen Rothwell
2011-07-18 8:55 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=20130404172648.27834d12cbb68338f4b89482@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nzimmer@sgi.com \
--cc=viro@zeniv.linux.org.uk \
/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).