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>,
"Thomas Gleixner" <tglx@linutronix.de>
Subject: linux-next: manual merge of the trivial tree with Linus' tree
Date: Wed, 3 Jul 2013 15:29:06 +1000 [thread overview]
Message-ID: <20130703152906.872979a7f0af80287e827920@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
kernel/irq/generic-chip.c between commit ccc414f83914 ("genirq: Add the
generic chip to the genirq docbook") from Linus' tree and commit
37074c5a1b99 ("irq/generic-chip: fix a few kernel-doc entries") from the
trivial tree.
I fixed it up (I just arbitrarily used Linus' tree version) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-07-03 5:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 5:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-26 4:29 linux-next: manual merge of the trivial tree with Linus' tree Stephen Rothwell
2014-05-06 3:52 Stephen Rothwell
2013-12-24 2:49 Stephen Rothwell
2012-06-29 4:36 Stephen Rothwell
2012-06-29 12:48 ` Jiri Kosina
2012-04-04 2:03 Stephen Rothwell
2012-03-29 1:48 Stephen Rothwell
2011-02-28 4:21 Stephen Rothwell
2010-11-09 2:31 Stephen Rothwell
2010-11-15 12:40 ` Jiri Kosina
2010-08-10 2:11 Stephen Rothwell
2010-08-10 11:22 ` Jiri Kosina
2010-03-08 2:20 Stephen Rothwell
2010-03-08 2:41 ` Mulyadi Santosa
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=20130703152906.872979a7f0af80287e827920@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=tglx@linutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).