From: Dominik Brodowski <linux@dominikbrodowski•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Kristoffer Ericson <kristoffer_e1@hotmail•com>
Subject: Re: linux-next: manual merge of pcmcia tree
Date: Tue, 24 Jun 2008 15:49:27 +0200 [thread overview]
Message-ID: <20080624134927.GA24288@isilmar.linta.de> (raw)
In-Reply-To: <20080623173241.3ac77e63.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, Jun 23, 2008 at 05:32:41PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/ide/legacy/ide-cs.c between commit
> a17bf220231a5061a29a27a99a273246eb3b156e ("pcmcia: add another pata/ide
> ID") from Linus' tree and commit f3aa02c57dec52fbe519c51f741e3a94d19dcb4c
> ("pcmcia: add another pata/ide ID") from the pcmcia tree.
>
> From the discussion on LKML, I assume the upstream version is correct and
> took that.
Thanks! The two patches which were now (fixed and) sent upstream are now
removed from the pcmcia tree.
Best,
Dominik
next prev parent reply other threads:[~2008-06-24 13:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-23 7:32 linux-next: manual merge of pcmcia tree Stephen Rothwell
2008-06-24 13:49 ` Dominik Brodowski [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-06-16 7:51 Stephen Rothwell
2008-06-16 8:12 ` Dominik Brodowski
2008-06-16 8:49 ` Stephen Rothwell
2008-06-16 8:57 ` Dominik Brodowski
2008-06-16 9:04 ` Stephen Rothwell
2008-06-16 9:05 ` Stephen Rothwell
2008-06-19 20:34 ` Jonathan Corbet
2008-06-20 17:43 ` Dominik Brodowski
2008-06-20 19:53 ` Jonathan Corbet
2008-06-21 3:37 ` 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=20080624134927.GA24288@isilmar.linta.de \
--to=linux@dominikbrodowski$(echo .)net \
--cc=kristoffer_e1@hotmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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