mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the trivial tree with the ux500-core tree
Date: Fri, 29 Apr 2011 09:25:13 +0200	[thread overview]
Message-ID: <BANLkTikJ5CVvS+P17T_Mhtqyb29vpDcmvw@mail.gmail.com> (raw)
In-Reply-To: <20110429115948.e949234b.sfr@canb.auug.org.au>

2011/4/29 Stephen Rothwell <sfr@canb.auug.org.au>:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-u300/gpio.c between commit 4a5a6e2804a3 ("mach-u300:
> rewrite gpio driver, move to drivers/gpio") from the ux500-core tree and
> commit b0c3af5ef0d7 ("arm: mach-u300/gpio: Fix mem_region resource size
> miscalculations") from the trivial tree.
>
> The former removed the file updated by the latter.  These updates should
> be applied to drivers/gpio/u300-gpio.c, now.  Joe, maybe you could update
> your patch and send it to Linus Walleij.

I rewrote the driver completely so likely it will rather be dropped, but
please check! I'll be happy to carry any patches.

Yours,
Linus Walleij

  reply	other threads:[~2011-04-29  7:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-29  1:59 Stephen Rothwell
2011-04-29  7:25 ` Linus Walleij [this message]
2011-05-05 13:48   ` Jiri Kosina
2011-05-06  9:29     ` Linus Walleij
2011-05-06  9:44       ` Jiri Kosina

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=BANLkTikJ5CVvS+P17T_Mhtqyb29vpDcmvw@mail.gmail.com \
    --to=linus.walleij@linaro.org \
    --cc=jkosina@suse.cz \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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®