From: David Miller <davem@davemloft•net>
To: herbert@gondor•apana.org.au
Cc: sfr@canb•auug.org.au, linux-next@vger•kernel.org,
bhutchings@solarflare•com
Subject: Re: linux-next: manual merge of the net tree with the tree
Date: Tue, 21 Apr 2009 01:33:23 -0700 (PDT) [thread overview]
Message-ID: <20090421.013323.108882771.davem@davemloft.net> (raw)
In-Reply-To: <20090421012216.GA12324@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor•apana.org.au>
Date: Tue, 21 Apr 2009 09:22:16 +0800
> On Tue, Apr 21, 2009 at 11:06:12AM +1000, Stephen Rothwell wrote:
>> Hi David,
>>
>> Today's linux-next merge of the net tree got a conflict in net/core/dev.c
>> between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
>> for multiple page fragments") from the net-current tree and commit
>> 76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
>> avoid copying shinfo") from the net tree.
>>
>> I used the version from the net tree.
>
> I think that's the right one.
I'm taking care of this merge conflict right now, thanks.
next prev parent reply other threads:[~2009-04-21 8:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-21 1:06 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2009-04-21 1:22 ` Herbert Xu
2009-04-21 8:33 ` David Miller [this message]
2009-04-21 11:08 ` Stephen Rothwell
-- 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-05-08 3:23 Stephen Rothwell
2009-05-08 7:49 ` David Miller
2009-05-08 8:21 ` Eric Dumazet
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=20090421.013323.108882771.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=bhutchings@solarflare$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-next@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