lkml.org 
[lkml]   [2011]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the pm tree with the mfd tree
Hi Rafael,

On Wed, 24 Aug 2011 00:16:33 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> On Tuesday, August 23, 2011, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the pm tree got a conflict in
> > drivers/mfd/twl4030-irq.c between commit 99efe0d4c992 ("mfd: Drop the
> > twl4030-irq kthread") from the mfd tree and commit febab68efa45
> > ("freezer: don't unnecessarily set PF_NOFREEZE explicitly") from the pm
> > tree.
> >
> > The former dropped the code modified by the latter, so I did that.
>
> Thanks!
>
> Unfortunately, I don't think we can really fix that other that making
> one tree depend on the other.

We can just leave it for Linus to fix up during the next merge window.
After all, I figured it out. :-)

("git rerere" takes care of fixing it up for me from now on)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-08-24 03:15    [W:0.043 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site