* linux-next: manual merge of the staging tree with the mips tree
@ 2010-01-18 7:53 Stephen Rothwell
2010-01-19 20:59 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-01-18 7:53 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Wu Zhangjin, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h between
commit 8cdfa0e5f204ee97d27f742ebd207f4de8ca2984 ("Loongson: Change the
Email address of Wu Zhangjin") from the mips tree and commit
1467bbc532da8c044e57706db232efe616ae5b00 ("staging: sm7xx: remove the
buggy 2D acceleration support") from the staging tree.
I just removed the 2 files (as was done in the staging tree).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the mips tree
2010-01-18 7:53 linux-next: manual merge of the staging tree with the mips tree Stephen Rothwell
@ 2010-01-19 20:59 ` Greg KH
2010-01-19 23:43 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2010-01-19 20:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wu Zhangjin, Ralf Baechle
On Mon, Jan 18, 2010 at 06:53:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h between
> commit 8cdfa0e5f204ee97d27f742ebd207f4de8ca2984 ("Loongson: Change the
> Email address of Wu Zhangjin") from the mips tree and commit
> 1467bbc532da8c044e57706db232efe616ae5b00 ("staging: sm7xx: remove the
> buggy 2D acceleration support") from the staging tree.
>
> I just removed the 2 files (as was done in the staging tree).
Thanks, that's the correct patch.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the mips tree
2010-01-19 20:59 ` Greg KH
@ 2010-01-19 23:43 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2010-01-19 23:43 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Wu Zhangjin, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
Hi Greg,
On Tue, 19 Jan 2010 12:59:35 -0800 Greg KH <greg@kroah•com> wrote:
>
> Thanks, that's the correct patch.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-19 23:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-18 7:53 linux-next: manual merge of the staging tree with the mips tree Stephen Rothwell
2010-01-19 20:59 ` Greg KH
2010-01-19 23:43 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox