From: Eric Dumazet <dada1@cosmosbay•com>
To: David Miller <davem@davemloft•net>
Cc: sfr@canb•auug.org.au, linux-next@vger•kernel.org, satoru.satoh@gmail•com
Subject: Re: linux-next: manual merge of the net tree with the tree
Date: Fri, 08 May 2009 10:21:04 +0200 [thread overview]
Message-ID: <4A03EB70.2060207@cosmosbay.com> (raw)
In-Reply-To: <20090508.004938.203704149.davem@davemloft.net>
David Miller a écrit :
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 8 May 2009 13:23:52 +1000
>
>> Today's linux-next merge of the net tree got a conflict in
>> include/net/tcp.h between commit 0c266898b42fe4e4e2f9edfc9d3474c10f93aa6a
>> ("tcp: Fix tcp_prequeue() to get correct rto_min value") from Linus' tree
>> and commit f5f8d86b231e0489c33542c42afbb14d32411ee8 ("tcp: tcp_prequeue()
>> cleanup") from the net tree.
>>
>> I fixed it up (see below - please check) and can carry the fix for a
>> while.
>
> Thanks Stephen, I'll do a merge to fix this up.
>
>
Sorry, I did my patches on top of net-next-2.6, I didnt realize some changes
were in flight on net-2.6
next prev parent reply other threads:[~2009-05-08 8:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-08 3:23 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2009-05-08 7:49 ` David Miller
2009-05-08 8:21 ` Eric Dumazet [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-22 1:51 Stephen Rothwell
2011-08-23 18:10 ` Niklaus Giger
2011-01-04 2:28 Stephen Rothwell
2010-10-12 0:17 Stephen Rothwell
2010-10-12 3:51 ` Stephen Rothwell
2010-10-12 5:56 ` Stefan Richter
2009-07-13 2:50 Stephen Rothwell
2009-05-21 4:06 Stephen Rothwell
2009-05-21 22:25 ` David Miller
2009-05-21 22:29 ` David Miller
2009-05-22 0:35 ` John W. Linville
2009-05-22 8:10 ` David Miller
2009-05-22 0:33 ` John W. Linville
2009-04-21 1:06 Stephen Rothwell
2009-04-21 1:22 ` Herbert Xu
2009-04-21 8:33 ` David Miller
2009-04-21 11:08 ` Stephen Rothwell
2009-03-20 0:32 Stephen Rothwell
2009-03-20 4:38 ` Pantelis Koukousoulas
2009-03-20 8:24 ` Mark McLoughlin
2009-03-20 9:28 ` David Miller
2009-03-04 2:03 Stephen Rothwell
2009-02-05 3:00 Stephen Rothwell
2009-02-05 2:55 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=4A03EB70.2060207@cosmosbay.com \
--to=dada1@cosmosbay$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=satoru.satoh@gmail$(echo .)com \
--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