From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: jkosina@suse•cz, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, damian@tvk•rwth-aachen.de,
netdev@vger•kernel.org, andre.goddard@gmail•com
Subject: Re: linux-next: manual merge of the trivial tree with the net-current tree
Date: Thu, 10 Dec 2009 14:41:02 -0800 (PST) [thread overview]
Message-ID: <20091210.144102.204958821.davem@davemloft.net> (raw)
In-Reply-To: <20091210221406.94b1aaaf.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 10 Dec 2009 22:14:06 +1100
> Hi Jiri,
>
> On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse•cz> wrote:
>>
>> Linus has merged trivial tree into his tree tonight, so I am afraid that
>> davem will have to fix the conflict when pulling Linus tree into
>> net-current.
>
> Yep, or Linus can fix it if he feels inclined.
Nah, I'll do a pull into net-2.6 to resolve the conflict first.
prev parent reply other threads:[~2009-12-10 22:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-10 3:37 linux-next: manual merge of the trivial tree with the net-current tree Stephen Rothwell
2009-12-10 8:45 ` Jiri Kosina
2009-12-10 11:14 ` Stephen Rothwell
2009-12-10 22:41 ` David Miller [this message]
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=20091210.144102.204958821.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=andre.goddard@gmail$(echo .)com \
--cc=damian@tvk$(echo .)rwth-aachen.de \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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