* Pull request for 'r8169-20060920-00' tag
@ 2006-09-20 19:23 Francois Romieu
2006-09-23 0:18 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Francois Romieu @ 2006-09-20 19:23 UTC (permalink / raw)
To: jeff; +Cc: netdev, Matt Bockol
Please pull from tag 'r8169-20060920-00' in repository
git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git
to get the change below.
Note:
Since something went wrong last time I submitted a pull request, here
goes the trace from the start of the branch
$ git rev-list $(git merge-base v2.6.18 r8169-20060920-00)..
d81bf551103cc3bc9e4f7ddf337511d6da0d088f
b39fe41f481d20c201012e4483e76c203802dda7 (<- r8169-20060912-00)
d2eed8cff9a1a5d7e12ec9ddf71432c466b104d0
5f787a1aca3705bdc6adbda36f8d6446380e85a6
64e4bfb40c9d07a48c1c7e5b8556e92e7cd7406a
5b0384f4fd079c24b976ee333e6d1f0c95cf14de
b518fa8eac2d0ac497c0fdb27e4cec68d0249bb7
188f4af04618b32b8ec7c630a3f18201c81ce70c
bcf0bf90cd9e9242b66e0563b6a8c8db2e4c262c
4ff96fa67379c31ced69f193c7ffba17051f38e8
623a1593c84afb86b2f496a56fb4ec37f82b5c78
9dccf61112e6755f4e6f154c1794bab3c509bc71
a2b98a697fa4e7564f78905b83db122824916cf9
Shortlog
--------
Francois Romieu :
r8169: the MMIO region of the 8167 stands behin BAR#1
Patch
-----
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 805562b..93cd1f4 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -210,7 +210,7 @@ static const struct {
static struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 },
- { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_1 },
+ { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
--
Ueimor
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: Pull request for 'r8169-20060920-00' tag
2006-09-20 19:23 Pull request for 'r8169-20060920-00' tag Francois Romieu
@ 2006-09-23 0:18 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2006-09-23 0:18 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, Matt Bockol
Francois Romieu wrote:
> Please pull from tag 'r8169-20060920-00' in repository
>
> git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git
>
> to get the change below.
>
> Note:
> Since something went wrong last time I submitted a pull request, here
> goes the trace from the start of the branch
pulled, thanks. Didn't download 7000+ objects, like it did last time :)
Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-23 0:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-20 19:23 Pull request for 'r8169-20060920-00' tag Francois Romieu
2006-09-23 0:18 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).