mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Francois Romieu <romieu@fr.zoreil.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, netdev@oss.sgi.com,
	jdmason@us.ibm.com, rich@phekda.gotadsl.co.uk, jgarzik@pobox.com
Subject: Re: [rft/update] r8169 changes in 2.6.x
Date: Wed, 23 Feb 2005 09:59:21 +0100	[thread overview]
Message-ID: <20050223085921.GA22268@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <20050222172935.30e43270.akpm@osdl.org>

Andrew Morton <akpm@osdl.org> :
> There are already a bunch of r8169 patches in Jeff's tree.  The combination
> isn't pretty:
[removed by parental advisory]

I sent r8169-4{0/1/2/3/4}0 on netdev + Jeff the 22/02/2005. Jeff's netdev
(thus your tree) already had the r8169-3xx changes.

Jeff has acked r8169-4{0/1/2/3}0 on 23/02/2005. r8169-440 (PCI-ID) won't
be applied (there should be no functionnal change nor merge side-effect).

r8169-4{5/6}0 have been published only here (so far).

So you can:
- apply r8169-4{0/1/2/3/5/6}0 if you have not updated to Jeff -netdev beyond
  what is currently available through plain old patch
- apply r8169-4{5/6}0 if you are bk-synced with Jeff -netdev (assuming that
  Jeff acked after he actually pushed to its bk repo)
- do something else until I verify the above and generate a dedicated
  patchsets for your tree.

--
Ueimor

  parent reply	other threads:[~2005-02-23  9:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-02-22 23:48 Francois Romieu
2005-02-23  1:29 ` Andrew Morton
2005-02-23  1:26   ` Jeff Garzik
2005-02-23  8:59   ` Francois Romieu [this message]
2005-02-23  9:09     ` Andrew Morton
2005-02-23 20:58       ` [patch 2.6.11-rc4-mm1 1/2] r8169: IRQ races during change of mtu Francois Romieu
2005-02-23 21:03         ` [patch 2.6.11-rc4-mm1 2/2] r8169: factor out some code Francois Romieu

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=20050223085921.GA22268@electric-eye.fr.zoreil.com \
    --to=romieu@fr.zoreil.com \
    --cc=akpm@osdl.org \
    --cc=jdmason@us.ibm.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    --cc=rich@phekda.gotadsl.co.uk \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®