From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>
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>
Subject: linux-next: manual merge of the mips tree with the net-current tree
Date: Tue, 24 Nov 2009 11:37:17 +1100 [thread overview]
Message-ID: <20091124113717.c5d86d41.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 648 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-24 0:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 0:37 Stephen Rothwell [this message]
2009-11-24 1:19 ` linux-next: manual merge of the mips tree with the net-current tree Ralf Baechle
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=20091124113717.c5d86d41.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.beregalov@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=florian@openwrt$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
/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