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,
John Crispin <blogic@openwrt•org>,
Ralf Baechle <ralf@linux-mips•org>,
Masanari Iida <standby24x7@gmail•com>
Subject: Re: linux-next: manual merge of the trivial tree with the mips tree
Date: Tue, 22 May 2012 11:01:18 +0200 (CEST) [thread overview]
Message-ID: <alpine.LNX.2.00.1205221101020.16396@pobox.suse.cz> (raw)
In-Reply-To: <20120522145041.67536df96e34135fd802fd2b@canb.auug.org.au>
On Tue, 22 May 2012, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/pci/pci-lantiq.c between commit 57c8cb8f2429 ("MIPS: pci:
> convert lantiq driver to OF") from the mips tree and commit 6997991ab0db
> ("mips: Fix printk typos in arc/mips") from the trivial tree.
>
> The former did the fix from the latter as a side effect so I used that.
I have dropped the hunk from trivial.git to avoid the unnecessary
conflict, thanks.
--
Jiri Kosina
SUSE Labs
next prev parent reply other threads:[~2012-05-22 9:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-22 4:50 linux-next: manual merge of the trivial tree with the mips tree Stephen Rothwell
2012-05-22 9:01 ` Jiri Kosina [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-23 3:03 Stephen Rothwell
2013-01-23 3:06 ` Stephen Rothwell
2011-10-14 3:31 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.1205221101020.16396@pobox.suse.cz \
--to=jkosina@suse$(echo .)cz \
--cc=blogic@openwrt$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=standby24x7@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