From: Len Brown <lenb@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Stefani Seibold <stefani@seibold•net>,
Andrew Morton <akpm@linux-foundation•org>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>,
Mattia Dongili <malattia@linux•it>
Subject: Re: linux-next: manual merge of the acpi tree with Linus' tree
Date: Thu, 24 Dec 2009 15:05:06 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.0912241502190.4159@localhost.localdomain> (raw)
In-Reply-To: <20091224232656.dafb0b1d.sfr@canb.auug.org.au>
> > Simpler to just drop the offending patch:
> >
> > a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> > sony-laptop: remove private workqueue, use keventd instead
> >
> > and get a properly refreshed version of that from Dmitry/Mattia later.
>
> Yep, that would work, thanks.
FYI, I dropped that patch yesterday, and then just now included
a refreshed patch from Dmitry. So linux-next should be conflict free now.
thanks,
Len Brown, Intel Open Source Technology Center
next prev parent reply other threads:[~2009-12-24 20:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-23 22:11 linux-next: manual merge of the acpi tree with Linus' tree Stephen Rothwell
2009-12-23 22:39 ` Stephen Rothwell
2009-12-24 0:02 ` Stephen Rothwell
2009-12-24 5:02 ` Len Brown
2009-12-24 12:26 ` Stephen Rothwell
2009-12-24 20:05 ` Len Brown [this message]
2009-12-25 0:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-10-07 23:49 Stephen Rothwell
2012-10-04 1:40 Stephen Rothwell
2012-03-30 0:46 Stephen Rothwell
2010-05-12 1:21 Stephen Rothwell
2010-01-18 2:56 Stephen Rothwell
2010-01-20 6:12 ` Len Brown
2010-01-20 6:29 ` Stephen Rothwell
2009-12-16 2:00 Stephen Rothwell
2009-03-30 3:20 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=alpine.LFD.2.00.0912241502190.4159@localhost.localdomain \
--to=lenb@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=malattia@linux$(echo .)it \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stefani@seibold$(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