All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bart Massey <bart@cs.pdx.edu>,
	Dominik Brodowski <linux@dominikbrodowski.net>
Subject: linux-next: manual merge of the staging tree with the pcmcia tree
Date: Mon, 9 Nov 2009 18:15:34 +1100	[thread overview]
Message-ID: <20091109181534.c844974d.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_labpc_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commits
c22f24e5f0ed5a45e4b339577a1151c4bbb8977a ("Staging: comedi: ni_labpc_cs:
added mandatory whitespace to comparison") and
f195fbc2466c79cda709074fdbb969079e0787e0 ("Staging: comedi: ni_labpc_cs:
wrapped long comments") from the staging tree.

I fixed it up (using the pcmcia tree version where there was a clash) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

             reply	other threads:[~2009-11-09  7:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-09  7:15 Stephen Rothwell [this message]
2009-11-20 18:29 ` linux-next: manual merge of the staging tree with the pcmcia tree Greg KH
  -- 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-21  1:34   ` Stephen Rothwell
2009-11-09  7:15 Stephen Rothwell
2009-11-20 18:27 ` Greg KH

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=20091109181534.c844974d.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bart@cs.pdx.edu \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.