Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the pm tree with the s390 tree | Date | Mon, 22 Aug 2011 08:20:29 +0200 |
| |
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
| |