From: Dave Chinner <david@fromorbit.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Eric Sandeen <sandeen@sandeen.net>,
Ben Myers <bpm@sgi.com>,
xfs-masters@oss.sgi.com
Subject: Re: linux-next: manual merge of the pm tree with the xfs tree
Date: Mon, 19 Dec 2011 16:01:48 +1100 [thread overview]
Message-ID: <20111219050148.GP23662@dastard> (raw)
In-Reply-To: <20111219151145.dba82854f65671a877db8ed3@canb.auug.org.au>
On Mon, Dec 19, 2011 at 03:11:45PM +1100, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> fs/xfs/xfs_buf.c between commit 687d1c5e8e26 ("xfs: remove unused
> XBT_FORCE_SLEEP bit") from the xfs tree and commit a0acae0e886d
> ("freezer: unexport refrigerator() and update try_to_freeze() slightly")
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks correct from the XFS POV, Stephen. Thanks.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
prev parent reply other threads:[~2011-12-19 5:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 4:11 linux-next: manual merge of the pm tree with the xfs tree Stephen Rothwell
2011-12-19 5:01 ` Dave Chinner [this message]
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=20111219050148.GP23662@dastard \
--to=david@fromorbit.com \
--cc=bpm@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sandeen@sandeen.net \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=xfs-masters@oss.sgi.com \
/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