public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Pantelis Koukousoulas <pktoss@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Miller <davem@davemloft•net>,
	linux-next@vger•kernel.org, Mark McLoughlin <markmc@redhat•com>,
	Rusty Russell <rusty@rustcorp•com.au>
Subject: Re: linux-next: manual merge of the net tree with the tree
Date: Fri, 20 Mar 2009 06:38:05 +0200	[thread overview]
Message-ID: <1295ed070903192138y23ef0a67mf0e38d96cad54dc0@mail.gmail.com> (raw)
In-Reply-To: <20090320113242.bfe7fe62.sfr@canb.auug.org.au>

On Fri, Mar 20, 2009 at 2:32 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/virtio_net.c between commit
> 4783256ef92f5aecd6d54693b16386f2a0021c2a ("virtio_net: Make virtio_net
> support carrier detection") from the net-current tree and commit
> 9f4d26d0f3016cf8813977d624751b94465fa317 ("virtio_net: add link status
> handling") from the net tree.
>
> I think that the latter patch means that the former is not needed, so I
> used the version from the net tree.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

Hi,

The correct merge is so that the conflicting part becomes like this:

+       /* If we have no carrier info, the answer is "always on". */
       vi->status = VIRTIO_NET_S_LINK_UP;
+       netif_carrier_on(vi->dev);

I.e., you need to keep this netif_carrier_on(vi->dev) to maintain
useful behavior
for current/older versions of qemu that don't support link handling (because
in this case VIRTIO_NET_S_LINK_UP will not cause netif_carrier_on to
be called).

Thanks,
Pantelis

next prev parent reply	other threads:[~2009-03-20  4:38 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-20  0:32 linux-next: manual merge of the net tree with the tree Stephen Rothwell
2009-03-20  4:38 ` Pantelis Koukousoulas [this message]
2009-03-20  8:24   ` Mark McLoughlin
2009-03-20  9:28 ` David Miller
  -- 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-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-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=1295ed070903192138y23ef0a67mf0e38d96cad54dc0@mail.gmail.com \
    --to=pktoss@gmail$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=markmc@redhat$(echo .)com \
    --cc=rusty@rustcorp$(echo .)com.au \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox