Linux-Next discussions
 help / color / mirror / Atom feed
From: John Crispin <blogic@openwrt.org>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Masanari Iida <standby24x7@gmail.com>,
	Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: manual merge of the trivial tree with the  tree
Date: Tue, 22 May 2012 13:53:43 +0200	[thread overview]
Message-ID: <4FBB7E47.7060500@openwrt.org> (raw)
In-Reply-To: <alpine.LNX.2.00.1205221115390.16396@pobox.suse.cz>

On 22/05/12 11:16, Jiri Kosina wrote:
> 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/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
>> commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
>> the subsystem folder") from the  tree and commit 6997991ab0db ("mips: Fix
>> printk typos in arc/mips") from the trivial tree.
>>
>> The typos fixed in the latter probably need to be applied to the renamed
>> files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
>> (resp).
>>
>> I have removed the old versions.
> I will probably keep this trivial conflict for Linus to resolve. Thanks,
>

Hi,

I'll try to resolve this and have the MIPS/Lantiq specifc parts flow via
Ralfs tree if no one minds

Thanks,
John

  reply	other threads:[~2012-05-22 11:54 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-22  4:54 linux-next: manual merge of the trivial tree with the tree Stephen Rothwell
2012-05-22  9:16 ` Jiri Kosina
2012-05-22 11:53   ` John Crispin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-06-14  4:31 Stephen Rothwell
2011-06-14  8:42 ` Jiri Kosina
2011-06-14  4:25 Stephen Rothwell
2010-11-09  2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
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
2009-03-12  4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
2009-02-04  6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22: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=4FBB7E47.7060500@openwrt.org \
    --to=blogic@openwrt.org \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.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