| To: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: linux-next: manual merge of the pm tree with the xfs tree |
| From: | Dave Chinner <david@xxxxxxxxxxxxx> |
| Date: | Mon, 19 Dec 2011 16:01:48 +1100 |
| Cc: | "Rafael J. Wysocki" <rjw@xxxxxxx>, linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Tejun Heo <tj@xxxxxxxxxx>, Eric Sandeen <sandeen@xxxxxxxxxxx>, Ben Myers <bpm@xxxxxxx>, xfs-masters@xxxxxxxxxxx |
| In-reply-to: | <20111219151145.dba82854f65671a877db8ed3@xxxxxxxxxxxxxxxx> |
| References: | <20111219151145.dba82854f65671a877db8ed3@xxxxxxxxxxxxxxxx> |
| User-agent: | Mutt/1.5.21 (2010-09-15) |
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@xxxxxxxxxxxxx
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | linux-next: manual merge of the pm tree with the xfs tree, Stephen Rothwell |
|---|---|
| Next by Date: | Merry Christmas & Happy New Year, DongDeLaser |
| Previous by Thread: | linux-next: manual merge of the pm tree with the xfs tree, Stephen Rothwell |
| Next by Thread: | Merry Christmas & Happy New Year, DongDeLaser |
| Indexes: | [Date] [Thread] [Top] [All Lists] |