public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>
Cc: Dominik Brodowski <linux@dominikbrodowski•net>,
	Alan Cox <alan@lxorguk•ukuu.org.uk>,
	linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of pcmcia tree
Date: Sat, 21 Jun 2008 13:37:32 +1000	[thread overview]
Message-ID: <20080621133732.df617d2a.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080620135327.2c4e5ce5@bike.lwn.net>

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

On Fri, 20 Jun 2008 13:53:27 -0600 Jonathan Corbet <corbet@lwn•net> wrote:
>
> On Fri, 20 Jun 2008 19:43:21 +0200
> Dominik Brodowski <linux@dominikbrodowski•net> wrote:
> 
> > Well, when do you intend to push that patch? I hope Linus will apply
> > the pcmcia tree soon after 2.6.26 is released.
> 
> Similar for bkl-removal - it's targeted at 2.6.27.
> 
> > > Here's the patch; if you take it let me know and I'll remove it from
> > > the bkl-removal tree.
> > 
> > I've applied it to pcmcia-2.6.git and just pushed that to kernel.org.
> 
> OK, I'll pull it from bkl-removal.

Thanks, guys - one conflict down (hopefully) :-)

-- 
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-21  3:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-16  7:51 linux-next: manual merge of pcmcia tree 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 [this message]
  -- 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=20080621133732.df617d2a.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=alan@lxorguk$(echo .)ukuu.org.uk \
    --cc=corbet@lwn$(echo .)net \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux@dominikbrodowski$(echo .)net \
    /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