From: Stephen Rothwell <sfr@canb.auug.org.au>
To: michal.simek@petalogix.com
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for December 4
Date: Fri, 4 Dec 2009 21:44:16 +1100 [thread overview]
Message-ID: <20091204214416.76231945.sfr@canb.auug.org.au> (raw)
In-Reply-To: <4B18D9FC.4020801@petalogix.com>
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
Hi Michal,
On Fri, 04 Dec 2009 10:44:28 +0100 Michal Simek <michal.simek@petalogix.com> wrote:
>
> > Merging microblaze/next
> > CONFLICT (content): Merge conflict in drivers/serial/of_serial.c
>
> I removed that my first patch from my next branch - it is in tty tree.
Thanks.
It is actually in Linus' tree now.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-12-04 10:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-04 9:30 Stephen Rothwell
2009-12-04 9:44 ` Michal Simek
2009-12-04 10:44 ` Stephen Rothwell [this message]
2009-12-06 18:00 ` [PATCH -next resend] staging: vt6x depends on WLAN Randy Dunlap
2009-12-08 1:20 ` patch staging-vt6x-depends-on-wlan.patch added to gregkh-2.6 tree gregkh
2009-12-06 18:03 ` [PATCH -next resend] g_multi kconfig: fix depends and help text Randy Dunlap
2009-12-06 18:04 ` [PATCH -next resend/fixed] media/miro: fix kconfig depends/select Randy Dunlap
2009-12-06 18:12 ` linux-next: Tree for December 4 (staging/iio) Randy Dunlap
2009-12-07 15:19 ` [PATCH] Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed Jonathan Cameron
2009-12-07 17:07 ` Randy Dunlap
2009-12-06 22:27 ` linux-next: Tree for December 4 (comedi) Randy Dunlap
[not found] <200812061455.37331.m.kozlowski@tuxland.pl>
2008-12-06 17:01 ` linux-next: Tree for December 4 Stephen Hemminger
2008-12-06 17:30 ` Mariusz Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2008-12-04 9:07 Stephen Rothwell
2008-12-06 12:04 ` Mariusz Kozlowski
2008-12-06 13:42 ` Alexander Beregalov
2008-12-07 0:43 ` 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=20091204214416.76231945.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@petalogix.com \
/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
all inboxes | Powered by JetHome®