From: Mel Gorman <mgorman@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeff Layton <jlayton@redhat.com>,
Trond Myklebust <trond.myklebust@fys.uio.no>
Subject: Re: linux-next: manual merge of the akpm tree with the nfs tree
Date: Tue, 31 Jul 2012 11:33:36 +0100 [thread overview]
Message-ID: <20120731103336.GN612@suse.de> (raw)
In-Reply-To: <20120731142441.0d01100f9d050ec6e479c923@canb.auug.org.au>
On Tue, Jul 31, 2012 at 02:24:41PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> net/sunrpc/xprtsock.c between commit 5cf02d09b50b ("nfs: skip commit in
> releasepage if we're freeing memory for fs-related reasons") from the nfs
> tree and commit "nfs: enable swap on NFS" from the akpm tree.
>
> Just context changes? I fixed it up (I think - see below) and can carry
> the fix as necessary.
Functionally it looks fine. As you say, it all looks like context
changes. Arguably code like this
current->flags &= ~PF_FSTRANS
could use tsk_restore_flags instead() even though it should never be
necessary as PF_FSTRANS would not be set on function entry. However,
it would set up a depedency between the patch sets that is undesirable.
If both sets get merged then it might make sense as a cleanup to use
tsk_restore_flags() but not until then.
Thanks Stephen.
--
Mel Gorman
SUSE Labs
next prev parent reply other threads:[~2012-07-31 10:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 4:24 linux-next: manual merge of the akpm tree with the nfs tree Stephen Rothwell
2012-07-31 10:33 ` Mel Gorman [this message]
2012-07-31 14:37 ` Myklebust, Trond
2012-07-31 15:19 ` Mel Gorman
2012-07-31 15:35 ` Myklebust, Trond
2012-07-31 17:50 ` Mel Gorman
2012-07-31 18:44 ` Andrew Morton
2012-07-31 19:00 ` Myklebust, Trond
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=20120731103336.GN612@suse.de \
--to=mgorman@suse.de \
--cc=akpm@linux-foundation.org \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trond.myklebust@fys.uio.no \
/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