From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Masanari Iida <standby24x7@gmail.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the trivial tree with the powerpc tree
Date: Fri, 16 Mar 2012 12:10:25 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.1203161210030.18356@pobox.suse.cz> (raw)
In-Reply-To: <20120316145658.3fb06c5213dbca29d6898c4b@canb.auug.org.au>
On Fri, 16 Mar 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
> of the legacy iSeries specific device drivers") from the powerpc tree and
> commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree.
Dropped a7ccf3775219 in my tree, thanks for report Stephen.
--
Jiri Kosina
SUSE Labs
next prev parent reply other threads:[~2012-03-16 11:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 3:56 linux-next: manual merge of the trivial tree with the powerpc tree Stephen Rothwell
2012-03-16 11:10 ` Jiri Kosina [this message]
2012-09-06 3:23 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=alpine.LNX.2.00.1203161210030.18356@pobox.suse.cz \
--to=jkosina@suse.cz \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=standby24x7@gmail.com \
/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).