linux-kernel - Re: linux-next: manual merge of the pm tree with the mfd tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20110824111201.75aac21e4e4ed697011a093d@canb.auug.org.au>
Date:	Wed, 24 Aug 2011 11:12:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Felipe Balbi <balbi@...com>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: Re: 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@...k.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped