From: Ralf Baechle <ralf@linux-mips.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexander Beregalov <a.beregalov@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Florian Fainelli <florian@openwrt.org>,
linux-mips@linux-mips.org,
Manuel Lauss <manuel.lauss@googlemail.com>
Subject: Re: linux-next: manual merge of the mips tree with the net-current tree
Date: Tue, 24 Nov 2009 01:19:58 +0000 [thread overview]
Message-ID: <20091124011958.GA8105@linux-mips.org> (raw)
In-Reply-To: <20091124113717.c5d86d41.sfr@canb.auug.org.au>
On Tue, Nov 24, 2009 at 11:37:17AM +1100, Stephen Rothwell wrote:
> Hi Ralf,
>
> Today's linux-next merge of the mips tree got a conflict in
> drivers/net/au1000_eth.c between commit
> 63edaf647607795a065e6956a79c47f500dc8447 ("Au1x00: fix crash when trying
> register_netdev()") from the net-current tree and commit
> 6cdbc95856e7f4ab4e7b2f2bdab5c3844537ad83 ("NET: au1000-eth: convert to
> platform_driver model") from the mips tree.
>
> It looks to me that the mips tree change supercedes the net-current one
> (since it moves the register_netdev() call much later), so I just used
> this file from the mips tree.
I agree. David, can you just drop the net-current patch then? This fix
is still needed for -stable however.
Ralf
next prev parent reply other threads:[~2009-11-24 1:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 0:37 linux-next: manual merge of the mips tree with the net-current tree Stephen Rothwell
2009-11-24 1:19 ` Ralf Baechle [this message]
2009-11-24 3:43 ` David Miller
2009-11-24 11:30 ` Florian Fainelli
2009-11-24 18:02 ` David Miller
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=20091124011958.GA8105@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=a.beregalov@gmail.com \
--cc=davem@davemloft.net \
--cc=florian@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-next@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.