From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Mike Frysinger" <vapier@gentoo.org>
Subject: linux-next: manual merge of the trivial tree with the tree
Date: Tue, 9 Nov 2010 13:27:25 +1100 [thread overview]
Message-ID: <20101109132725.2e17ae65.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/blackfin/mach-bf538/include/mach/defBF539.h,
arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and
arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various
commits from the blackfin tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
I just used the versions from the blackfin tree for now since they moved
large amounts of code around and deleted the latter 2 files.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-11-09 2:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 2:27 Stephen Rothwell [this message]
2010-11-19 16:08 ` Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 4:54 Stephen Rothwell
2012-05-22 9:16 ` Jiri Kosina
2012-05-22 11:53 ` John Crispin
2011-06-14 4:31 Stephen Rothwell
2011-06-14 8:42 ` Jiri Kosina
2011-06-14 4:25 Stephen Rothwell
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
2009-11-09 4:43 Stephen Rothwell
2009-11-09 8:45 ` Jiri Kosina
2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25 ` Jiri Kosina
2009-07-31 4:39 Stephen Rothwell
2009-08-08 0:13 ` Jiri Kosina
2009-08-08 0:46 ` 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=20101109132725.2e17ae65.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®