From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Dmitry Artamonow <mad_soft@inbox.ru>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Dominik Brodowski <linux@dominikbrodowski.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the pcmcia tree with the arm tree
Date: Thu, 3 Dec 2009 17:04:52 +0000 [thread overview]
Message-ID: <20091203170452.GD14241@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20091202115649.GA2150@rainbow>
On Wed, Dec 02, 2009 at 02:56:49PM +0300, Dmitry Artamonow wrote:
> On 14:03 Tue 01 Dec , Stephen Rothwell wrote:
> > Hi Dominik,
> >
> > Today's linux-next merge of the pcmcia tree got a conflict in
> > drivers/pcmcia/sa1100_h3600.c between commit
> > 6ce8f65e71f0d80ee23b543be09789dd865a99be ("ARM: 5811/1: pcmcia: convert
> > sa1100_h3600 driver to gpiolib") from the arm tree and commit
> > 66024db57d5b9011e274b314affad68f370c0d6f ("PCMCIA: stop duplicating
> > pci_irq in soc_pcmcia_socket") from the pcmcia tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. Please
> > check the fix below.
>
> Fix looks good to me, and testing next-20091201 on real device (h3600)
> shows no problems with pcmcia.
>
> Perhaps this merge conflict can be avoided by merging Russell's PCMCIA
> patches through arm tree. But, anyway, it's Russell and Dominik
> to decide.
If that's what Dominik would like me to do.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2009-12-03 17:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 3:03 linux-next: manual merge of the pcmcia tree with the arm tree Stephen Rothwell
2009-12-02 11:56 ` Dmitry Artamonow
2009-12-02 22:25 ` Stephen Rothwell
2009-12-05 10:30 ` Russell King
2009-12-05 11:07 ` Dominik Brodowski
2009-12-06 16:51 ` Dmitry Artamonow
2009-12-03 17:04 ` Russell King [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-05 3:22 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=20091203170452.GD14241@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=mad_soft@inbox.ru \
--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