From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Daniel Patrick Johnson <teknotus@teknot.us>,
Dominik Brodowski <linux@dominikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging tree with the pcmcia tree
Date: Fri, 20 Nov 2009 10:27:31 -0800 [thread overview]
Message-ID: <20091120182731.GA4804@kroah.com> (raw)
In-Reply-To: <20091109181527.a42431bc.sfr@canb.auug.org.au>
On Mon, Nov 09, 2009 at 06:15:27PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/ni_mio_cs.c between commit
> 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
> drivers") from the pcmcia tree and commit
> bd7881ee58045b4b684f4400b24081656e0c6986 ("Staging: comedi: ni_mio_cs.c:
> coding style cleanup") from the staging tree.
>
> I fixed it up (mainly using the pcmcia tree version when there was a
> clash) and can carry the fix as necessary.
Thanks for the fix.
greg k-h
next prev parent reply other threads:[~2009-11-20 18:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-09 7:15 linux-next: manual merge of the staging tree with the pcmcia tree Stephen Rothwell
2009-11-20 18:27 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
2009-11-21 1:34 ` 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=20091120182731.GA4804@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=sfr@canb.auug.org.au \
--cc=teknotus@teknot.us \
/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;
as well as URLs for NNTP newsgroup(s).