From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: michal.simek@petalogix•com
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
John Linn <john.linn@xilinx•com>, Magnus Damm <damm@igel•co.jp>
Subject: Re: linux-next: manual merge of the suspend tree with the microblaze tree
Date: Mon, 6 Jul 2009 23:32:23 +0200 [thread overview]
Message-ID: <200907062332.24018.rjw@sisk.pl> (raw)
In-Reply-To: <4A51A5E9.1030605@petalogix.com>
On Monday 06 July 2009, Michal Simek wrote:
> Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the suspend tree got a conflict in
> > arch/microblaze/include/asm/device.h between commit
> > 19aff4132a289ec83ca6eee8b3db28855b9f06af ("microblaze: Adding
> > dev_arch_data functions") from the microblaze tree and commit
> > c959b4101b10723eeb190ef2e82765dd529c26b6 ("Driver Core: Add platform
> > device arch data V3") from the suspend tree.
> >
> > Just overlapping additions. I fixed it up (see below) and can carry the
> > fix as necessary.
> >
> I'll revert this patch and I'll add it later.
> Rafael you don't need to do any changes. I'll do them.
> This John L patch is not important - just for any drivers which are not
> in mainline.
> I'll add it later.
Many thanks!
Best,
Rafael
prev parent reply other threads:[~2009-07-06 21:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 4:00 linux-next: manual merge of the suspend tree with the microblaze tree Stephen Rothwell
2009-07-06 7:19 ` Michal Simek
2009-07-06 7:21 ` Michal Simek
2009-07-06 21:32 ` Rafael J. Wysocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200907062332.24018.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=damm@igel$(echo .)co.jp \
--cc=john.linn@xilinx$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@petalogix$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox