From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wu Zhangjin <wuzhangjin@gmail•com>,
Ralf Baechle <ralf@linux-mips•org>
Subject: linux-next: manual merge of the staging tree with the mips tree
Date: Mon, 18 Jan 2010 18:53:51 +1100 [thread overview]
Message-ID: <20100118185351.3c6b719f.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2010-01-18 7:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-18 7:53 Stephen Rothwell [this message]
2010-01-19 20:59 ` linux-next: manual merge of the staging tree with the mips tree Greg KH
2010-01-19 23:43 ` Stephen Rothwell
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=20100118185351.3c6b719f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=wuzhangjin@gmail$(echo .)com \
/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