lkml.org 
[lkml]   [2011]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the pm tree with the s390 tree
Date
On Monday, August 22, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/s390/include/asm/thread_info.h between commit 5f67c275efe7 ("[S390]
> fix _TIF_SINGLE_STEP definition") from the s390 tree and commit
> c9ff4d7b50c4 ("freezer: remove now unused TIF_FREEZE") from the pm tree.
>
> I fixed it up (see below)

Thanks!

> and can carry the fix as necessary.

Please do that.

Rafael


\
 
 \ /
  Last update: 2011-08-22 08:21    [W:0.030 / U:1.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site