From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wim Van Sebroeck <wim@iguana•be>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: Tree for March 10
Date: Tue, 10 Mar 2009 22:07:51 +1100 [thread overview]
Message-ID: <20090310220751.bd25139f.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090310093324.GA26779@infomag.iguana.be>
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi Wim,
On Tue, 10 Mar 2009 10:33:24 +0100 Wim Van Sebroeck <wim@iguana•be> wrote:
>
> > Merging watchdog/master
> > CONFLICT (content): Merge conflict in drivers/watchdog/orion5x_wdt.c
> > CONFLICT (content): Merge conflict in drivers/watchdog/rc32434_wdt.c
>
> I redid the linux-2.6-watchdog-next tree. Should be fixed next time.
Thanks. I could see that they were just continuations of patches that
went into Linus' tree, so was not worried about them.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-03-10 11:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 8:55 linux-next: Tree for March 10 Stephen Rothwell
2009-03-10 9:33 ` Wim Van Sebroeck
2009-03-10 11:07 ` Stephen Rothwell [this message]
2009-03-10 14:12 ` Next 10: Badness at mm/allocpercpu.c:123 Sachin P. Sant
2009-03-11 4:16 ` Sachin P. Sant
2009-03-11 5:53 ` [GIT PATCH tj-percpu] percpu: fix spurious alignment WARN in legacy SMP percpu allocator Tejun Heo
2009-03-11 5:54 ` [RESEND GIT " Tejun Heo
2009-03-11 6:48 ` Sachin P. Sant
2009-03-11 9:31 ` Ingo Molnar
2009-03-11 8:50 ` Next 10: Badness at mm/allocpercpu.c:123 AA
2009-03-11 8:53 ` where should I map 0x8000,0000 ~ 0xfc00,0000 to ? AA
2009-03-10 18:57 ` linux-next: Tree for March 10 (crypto & NLATTR) Randy Dunlap
2009-03-10 19:56 ` Geert Uytterhoeven
2009-03-10 20:08 ` Randy Dunlap
2009-03-10 20:17 ` David Miller
2009-03-11 1:07 ` Herbert Xu
2009-03-11 12:25 ` Geert Uytterhoeven
2009-03-11 16:55 ` Randy Dunlap
2009-03-10 18:59 ` [PATCH -next] staging/p9auth: fix dependency/build error Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2010-03-10 7:18 linux-next: Tree for March 10 Stephen Rothwell
2011-03-10 7:09 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=20090310220751.bd25139f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wim@iguana$(echo .)be \
/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