From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Ben Hutchings" <bhutchings@solarflare•com>,
"David S. Miller" <davem@davemloft•net>,
"\"André Goddard Rosa\"" <andre.goddard@gmail•com>
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
Date: Tue, 1 Dec 2009 06:55:11 +1100 [thread overview]
Message-ID: <20091201065511.37da12f1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LSU.2.00.0911301335570.6953@wotan.suse.de>
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
Hi Jiri,
On Mon, 30 Nov 2009 13:36:18 +0100 (CET) Jiri Kosina <jkosina@suse•cz> wrote:
>
> Dropped the falcon.c hunk from the pile, so the conflict should be gone.
Thanks for that.
--
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-11-30 19:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 2:53 linux-next: manual merge of the trivial tree with the net tree Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-22 4:18 Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2010-10-12 0:53 Stephen Rothwell
2010-09-24 2:19 Stephen Rothwell
2010-09-24 12:09 ` Jiri Kosina
2010-02-24 5:21 Stephen Rothwell
2010-02-16 3:50 Stephen Rothwell
2010-02-05 2:37 Stephen Rothwell
2010-02-05 4:26 ` David Miller
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
2010-02-03 2:30 Stephen Rothwell
2010-02-03 10:39 ` Jiri Kosina
2010-02-04 4:04 ` David Miller
2010-02-04 9:52 ` Jiri Kosina
2010-02-04 12:50 ` Giuseppe CAVALLARO
2010-02-04 13:52 ` Giuseppe CAVALLARO
2010-02-04 17:33 ` David Miller
2009-11-24 6:14 Stephen Rothwell
2009-11-24 9:13 ` Jiri Kosina
2009-11-30 1:13 ` David Miller
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=20091201065511.37da12f1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andre.goddard@gmail$(echo .)com \
--cc=bhutchings@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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