Linux-Next discussions
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: linux-next@vger.kernel.org, Alan Cox <alan@lxorguk.ukuu.org.uk>,
	Jonathan Corbet <corbet@lwn.net>
Subject: linux-next: manual merge of pcmcia tree
Date: Mon, 16 Jun 2008 17:51:26 +1000	[thread overview]
Message-ID: <20080616175126.e461b22b.sfr@canb.auug.org.au> (raw)

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

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/char/pcmcia/cm4000_cs.c between commit
d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
pushdown") from the bkl-removal tree and commit
5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
unlocked_ioctl") from the pcmcia tree.

It was just overlapping replacement of includes, so I did the obvious
fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

             reply	other threads:[~2008-06-16  7:51 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-16  7:51 Stephen Rothwell [this message]
2008-06-16  8:12 ` linux-next: manual merge of pcmcia tree 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
  -- strict thread matches above, loose matches on Subject: below --
2008-06-23  7:32 Stephen Rothwell
2008-06-24 13:49 ` Dominik Brodowski

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=20080616175126.e461b22b.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=corbet@lwn.net \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox