* linux-next: rr merge conflict
@ 2008-06-05 4:38 Stephen Rothwell
2008-06-06 0:02 ` Rusty Russell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-06-05 4:38 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Mark McLoughlin, Jeff Garzik
[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]
Hi Rusty,
Today's merge of the rr tree got a conflict in drivers/net/virtio_net.c
between commits 11a3a1546d0adc36485c2ad4af7ab950712df6ff ("virtio: fix
delayed xmit of packet and freeing of old packets.") and
7eb2e25112bf920bb0a4d1cca445f3d96874c25f ("virtio: fix virtio_net xmit of
freed skb bug") from the net-current tree and commits
c95d10b237db3449ccb7c8ba1675f0bd83722d19
("virtio:net-force-callback-on-empty"),
5a37649cd6d69a0ded7cf32c89107f542ea4c69b ("virtio:net-fix-last-xmit") and
a13dd9f483bd628423b2351ca757f641370c1227
("virtio:net-fix-dangling-packets") from the rr tree. (I think :-))
Some of these commits do basically the same things, but are also mixed up with
other changes to this file in the rr tree. I used the rr tree version
but you should check that it makes sense. This should go away once
net-current gets merged into Linus' tree and you merge (or rebase)
against that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: rr merge conflict
2008-06-05 4:38 linux-next: rr merge conflict Stephen Rothwell
@ 2008-06-06 0:02 ` Rusty Russell
0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2008-06-06 0:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Mark McLoughlin, Jeff Garzik
On Thursday 05 June 2008 14:38:59 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's merge of the rr tree got a conflict in drivers/net/virtio_net.c
> between commits 11a3a1546d0adc36485c2ad4af7ab950712df6ff ("virtio: fix
> delayed xmit of packet and freeing of old packets.") and
> 7eb2e25112bf920bb0a4d1cca445f3d96874c25f ("virtio: fix virtio_net xmit of
> freed skb bug") from the net-current tree and commits
> c95d10b237db3449ccb7c8ba1675f0bd83722d19
> ("virtio:net-force-callback-on-empty"),
> 5a37649cd6d69a0ded7cf32c89107f542ea4c69b ("virtio:net-fix-last-xmit") and
> a13dd9f483bd628423b2351ca757f641370c1227
> ("virtio:net-fix-dangling-packets") from the rr tree. (I think :-))
>
> Some of these commits do basically the same things, but are also mixed up
> with other changes to this file in the rr tree. I used the rr tree version
> but you should check that it makes sense. This should go away once
> net-current gets merged into Linus' tree and you merge (or rebase) against
> that.
Ack. Jeff has taken the patches I sent, but I have a few more which require
minor virtio changes first. So resorting to the -rr ones is the correct
workaround for the moment.
Thanks,
Rusty.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-06 0:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-05 4:38 linux-next: rr merge conflict Stephen Rothwell
2008-06-06 0:02 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox