* linux-next: manual merge of the pm tree with the mfd tree
@ 2011-08-23 3:56 Stephen Rothwell
2011-08-23 9:58 ` Felipe Balbi
2011-08-23 22:16 ` Rafael J. Wysocki
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2011-08-23 3:56 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Felipe Balbi, Samuel Ortiz, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi Rafael,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the pm tree with the mfd tree
2011-08-23 3:56 linux-next: manual merge of the pm tree with the mfd tree Stephen Rothwell
@ 2011-08-23 9:58 ` Felipe Balbi
2011-08-23 22:16 ` Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2011-08-23 9:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafael J. Wysocki, linux-next, linux-kernel, Felipe Balbi,
Samuel Ortiz, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
Hi,
On Tue, Aug 23, 2011 at 01:56:19PM +1000, 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.
if you guys need me to rebase on top of something else let me know
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the pm tree with the mfd tree
2011-08-23 3:56 linux-next: manual merge of the pm tree with the mfd tree Stephen Rothwell
2011-08-23 9:58 ` Felipe Balbi
@ 2011-08-23 22:16 ` Rafael J. Wysocki
2011-08-24 1:12 ` Stephen Rothwell
1 sibling, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2011-08-23 22:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Felipe Balbi, Samuel Ortiz, Mark Brown
On Tuesday, August 23, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the pm tree with the mfd tree
2011-08-23 22:16 ` Rafael J. Wysocki
@ 2011-08-24 1:12 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2011-08-24 1:12 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Felipe Balbi, Samuel Ortiz, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-24 1:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 3:56 linux-next: manual merge of the pm tree with the mfd tree Stephen Rothwell
2011-08-23 9:58 ` Felipe Balbi
2011-08-23 22:16 ` Rafael J. Wysocki
2011-08-24 1:12 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox