net driver fixes
Subsystems (6)
PATCH 1/1 net driver fixes
Note: this is based off of Linus's latest commit (5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous submissions are now upstream (thanks!).
Please pull from 'upstream-davem' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-davem
to receive the following updates:
MAINTAINERS | 11 +- drivers/net/cs89x0.c | 12 +- drivers/net/ehea/ehea.h | 34 +++++- drivers/net/ehea/ehea_main.c | 281 +++++++++++++++++++++++++++++++++--- drivers/net/fs_enet/fs_enet-main.c | 7 +- drivers/net/gianfar.c | 14 +- drivers/net/igb/igb_main.c | 15 +-- drivers/net/pcmcia/pcnet_cs.c | 10 +- drivers/net/phy/mdio_bus.c | 4 +- drivers/net/sis190.c | 15 ++- drivers/net/tlan.c | 64 ++++---- drivers/net/tulip/uli526x.c | 12 ++- drivers/net/virtio_net.c | 2 +- drivers/s390/net/claw.c | 39 +++--- 14 files changed, 399 insertions(+), 121 deletions(-)
Adrian Bunk (1):
net/phy/mdio_bus.c: fix a check-after-use
Andy Gospodarek (1):
igb: fix legacy mode irq issue
Becky Bruce (1):
gianfar: don't pass NULL dev ptr to DMA ops
Bill Hayes (1):
igb: Fix panic with NICs with 1000BASE-SX PHY
Christian Borntraeger (1):
virtio_net: Fix oops on early interrupts - introduced by virtio reset code
Francois Romieu (1):
sis190: read the mac address from the eeprom first
Grant Grundler (2):
update TULIP MAINTAINERS
uli526x partially recognizing interface
Harvey Harrison (1):
tlan: add static to function definitions
Julia Lawall (1):
claw: make use of DIV_ROUND_UP
Komuro (1):
pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message.
Leonardo Potenza (1):
drivers/net/cs89x0.c: compilation warning fix
Scott Wood (1):
fs_enet: Don't call phy_mii_ioctl() in atomic context.
Thomas Klein (1):
ehea: add kdump support
MAINTAINERS +7 -4
@@ -3887,10 +3887,13 @@ M: [email protected] L: [email protected] S: Maintained -TULIP NETWORK DRIVER -L: [email protected] -W: http://sourceforge.net/projects/tulip/ -S: Orphan +TULIP NETWORK DRIVERS +P: Grant Grundler +M: [email protected] +P: Kyle McMartin +M: [email protected] +L: [email protected] +S: Maintained TUN/TAP driver P: Maxim Krasnyansky
drivers/net/cs89x0.c +6 -6
@@ -172,30 +172,30 @@ static char version[] __initdata =them to system IRQ numbers. This mapping is card specific and is set to the configuration of the Cirrus Eval board for this chip. */ #ifdef CONFIG_ARCH_CLPS7500 -static unsigned int netcard_portlist[]__initdata = +static unsigned int netcard_portlist[]__used __initdata = {0x80090303 ,0x300 ,0x320 ,0x340 ,0x360 ,0x200 ,0x220 ,0x240 ,0x260 ,0x280 ,0x2a0 ,0x2c0 ,0x2e0 ,0 };static unsigned int cs8900_irq_map[] = {12 ,0 ,0 ,0 };#elif defined(CONFIG_SH_HICOSH4 ) -static unsigned int netcard_portlist[]__initdata = +static unsigned int netcard_portlist[]__used __initdata = {0x0300 ,0 };static unsigned int cs8900_irq_map[] = {1 ,0 ,0 ,0 };#elif defined(CONFIG_MACH_IXDP2351 ) -static unsigned int netcard_portlist[]__initdata = {IXDP2351_VIRT_CS8900_BASE ,0 }; +static unsigned int netcard_portlist[]__used __initdata = {IXDP2351_VIRT_CS8900_BASE ,0 };static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900 ,0 ,0 ,0 };#include <asm/irq.h> #elif defined(CONFIG_ARCH_IXDP2X01 )#include <asm/irq.h> -static unsigned int netcard_portlist[]__initdata = {IXDP2X01_CS8900_VIRT_BASE ,0 }; +static unsigned int netcard_portlist[]__used __initdata = {IXDP2X01_CS8900_VIRT_BASE ,0 };static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900 ,0 ,0 ,0 };#elif defined(CONFIG_ARCH_PNX010X )#include <asm/irq.h> #include <asm/arch/gpio.h> #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)/* = Physical address 0x48200000 */ #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1/* Event inputs bank 1 - ID 35/bit 3 */ -static unsigned int netcard_portlist[]__initdata = {CIRRUS_DEFAULT_BASE ,0 }; +static unsigned int netcard_portlist[]__used __initdata = {CIRRUS_DEFAULT_BASE ,0 };static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ ,0 ,0 ,0 };#else -static unsigned int netcard_portlist[]__initdata = +static unsigned int netcard_portlist[]__used __initdata = {0x300 ,0x320 ,0x340 ,0x360 ,0x200 ,0x220 ,0x240 ,0x260 ,0x280 ,0x2a0 ,0x2c0 ,0x2e0 ,0 };static unsigned int cs8900_irq_map[] = {10 ,11 ,12 ,5 };#endif
drivers/net/ehea/ehea.h +33 -1
@@ -40,7 +40,7 @@#include <asm/io.h> #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0083" +#define DRV_VERSION "EHEA_0087"/* eHEA capability flags */ #define DLPAR_PORT_ADD_REM 1
@@ -386,6 +386,13 @@ struct ehea_port_res {#define EHEA_MAX_PORTS 16 + +#define EHEA_NUM_PORTRES_FW_HANDLES 6/* QP handle, SendCQ handle, +RecvCQ handle, EQ handle, +SendMR handle, RecvMR handle */ +#define EHEA_NUM_PORT_FW_HANDLES 1/* EQ handle */ +#define EHEA_NUM_ADAPTER_FW_HANDLES 2/* MR handle, NEQ handle */ +struct ehea_adapter {u64 handle;struct of_device *ofdev;
@@ -405,6 +412,31 @@ struct ehea_mc_list {u64 macaddr; }; +/* kdump support */ +struct ehea_fw_handle_entry { +u64 adh;/* Adapter Handle */ +u64 fwh;/* Firmware Handle */ +}; + +struct ehea_fw_handle_array { +struct ehea_fw_handle_entry *arr; +int num_entries; +struct semaphore lock; +}; + +struct ehea_bcmc_reg_entry { +u64 adh;/* Adapter Handle */ +u32 port_id;/* Logical Port Id */ +u8 reg_type;/* Registration Type */ +u64 macaddr; +}; + +struct ehea_bcmc_reg_array { +struct ehea_bcmc_reg_entry *arr; +int num_entries; +struct semaphore lock; +}; +#define EHEA_PORT_UP 1#define EHEA_PORT_DOWN 0#define EHEA_PHY_LINK_UP 1
drivers/net/ehea/ehea_main.c +257 -24
460 lines not on this page · raw message
drivers/net/fs_enet/fs_enet-main.c +1 -6
@@ -946,16 +946,11 @@ static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {struct fs_enet_private *fep =netdev_priv (dev);struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&rq->ifr_data; -unsigned long flags; -int rc;if (!netif_running (dev))return -EINVAL ; -spin_lock_irqsave (&fep->lock, flags); - rc =phy_mii_ioctl (fep->phydev, mii, cmd); -spin_unlock_irqrestore (&fep->lock, flags); -return rc; +return phy_mii_ioctl (fep->phydev, mii, cmd); }extern int fs_mii_connect (struct net_device *dev);
drivers/net/gianfar.c +7 -7
@@ -605,7 +605,7 @@ void stop_gfar(struct net_device *dev)free_skb_resources (priv); - dma_free_coherent(NULL, + dma_free_coherent(&dev->dev, sizeof(struct txbd8)*priv->tx_ring_size + sizeof(struct rxbd8)*priv->rx_ring_size, priv->tx_bd_base,
@@ -626,7 +626,7 @@ static void free_skb_resources(struct gfar_private *priv)for (i =0 ; i < priv->tx_ring_size; i++) {if (priv->tx_skbuff[i]) { -dma_unmap_single (NULL , txbdp->bufPtr, +dma_unmap_single (&priv->dev->dev, txbdp->bufPtr, txbdp->length,DMA_TO_DEVICE );dev_kfree_skb_any (priv->tx_skbuff[i]);
@@ -643,7 +643,7 @@ static void free_skb_resources(struct gfar_private *priv)if (priv->rx_skbuff !=NULL ) {for (i =0 ; i < priv->rx_ring_size; i++) {if (priv->rx_skbuff[i]) { -dma_unmap_single (NULL , rxbdp->bufPtr, +dma_unmap_single (&priv->dev->dev, rxbdp->bufPtr, priv->rx_buffer_size,DMA_FROM_DEVICE );
@@ -708,7 +708,7 @@ int startup_gfar(struct net_device *dev)gfar_write (®s->imask,IMASK_INIT_CLEAR );/* Allocate memory for the buffer descriptors */ - vaddr = (unsigned long )dma_alloc_coherent (NULL , + vaddr = (unsigned long )dma_alloc_coherent (&dev->dev,sizeof (struct txbd8 ) * priv->tx_ring_size +sizeof (struct rxbd8 ) * priv->rx_ring_size, &addr,GFP_KERNEL );
@@ -919,7 +919,7 @@ err_irq_fail: rx_skb_fail:free_skb_resources (priv); tx_skb_fail: - dma_free_coherent(NULL, + dma_free_coherent(&dev->dev, sizeof(struct txbd8)*priv->tx_ring_size + sizeof(struct rxbd8)*priv->rx_ring_size, priv->tx_bd_base,
@@ -1053,7 +1053,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)/* Set buffer length and pointer */ txbdp->length = skb->len; - txbdp->bufPtr =dma_map_single (NULL , skb->data, + txbdp->bufPtr =dma_map_single (&dev->dev, skb->data, skb->len,DMA_TO_DEVICE );/* Save the skb pointer so we can free it later */
@@ -1332,7 +1332,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp)*/ skb_reserve (skb, alignamount); - bdp->bufPtr =dma_map_single (NULL , skb->data, + bdp->bufPtr =dma_map_single (&dev->dev, skb->data, priv->rx_buffer_size,DMA_FROM_DEVICE ); bdp->length =0 ;
drivers/net/igb/igb_main.c +6 -9
@@ -439,7 +439,7 @@ static int igb_request_irq(struct igb_adapter *adapter) err =igb_request_msix (adapter);if (!err) {/* enable IAM, auto-mask, -* DO NOT USE EIAME or IAME in legacy mode */ +* DO NOT USE EIAM or IAM in legacy mode */ wr32 (E1000_IAM ,IMS_ENABLE_MASK ); goto request_done; }
@@ -465,14 +465,9 @@ static int igb_request_irq(struct igb_adapter *adapter) err =request_irq (adapter->pdev->irq, &igb_intr,IRQF_SHARED , netdev->name, netdev); -if (err) { +if (err)dev_err (&adapter->pdev->dev,"Error %d getting interrupt\n" , err); - goto request_done; - } - -/* enable IAM, auto-mask */ -wr32 (E1000_IAM ,IMS_ENABLE_MASK ); request_done:return err;
@@ -821,7 +816,8 @@ void igb_reset(struct igb_adapter *adapter)wr32 (E1000_VET ,ETHERNET_IEEE_VLAN_TYPE );igb_reset_adaptive (&adapter->hw); - adapter->hw.phy.ops.get_phy_info (&adapter->hw); +if (adapter->hw.phy.ops.get_phy_info) + adapter->hw.phy.ops.get_phy_info (&adapter->hw); }/**
@@ -2057,7 +2053,8 @@ static void igb_set_multi(struct net_device *netdev)static void igb_update_phy_info (unsigned long data) {struct igb_adapter *adapter = (struct igb_adapter *) data; - adapter->hw.phy.ops.get_phy_info (&adapter->hw); +if (adapter->hw.phy.ops.get_phy_info) + adapter->hw.phy.ops.get_phy_info (&adapter->hw); }/**
drivers/net/pcmcia/pcnet_cs.c +8 -2
@@ -590,6 +590,13 @@ static int pcnet_config(struct pcmcia_device *link) dev->if_port =0 ; } +if ((link->conf.ConfigBase ==0x03c0 ) + && (link->manf_id ==0x149 ) && (link->card_id =0xc1ab )) { +printk (KERN_INFO "pcnet_cs: this is an AX88190 card!\n" ); +printk (KERN_INFO "pcnet_cs: use axnet_cs instead.\n" ); + goto failed; + } + local_hw_info =get_hwinfo (link);if (local_hw_info ==NULL ) local_hw_info =get_prom (link);
@@ -1567,12 +1574,11 @@ static struct pcmcia_device_id pcnet_ids[] = {PCMCIA_DEVICE_MANF_CARD (0x0104 ,0x0145 ),PCMCIA_DEVICE_MANF_CARD (0x0149 ,0x0230 ),PCMCIA_DEVICE_MANF_CARD (0x0149 ,0x4530 ), -/* PCMCIA_DEVICE_MANF_CARD(0x0149, 0xc1ab), conflict with axnet_cs */ +PCMCIA_DEVICE_MANF_CARD (0x0149 ,0xc1ab ),PCMCIA_DEVICE_MANF_CARD (0x0186 ,0x0110 ),PCMCIA_DEVICE_MANF_CARD (0x01bf ,0x2328 ),PCMCIA_DEVICE_MANF_CARD (0x01bf ,0x8041 ),PCMCIA_DEVICE_MANF_CARD (0x0213 ,0x2452 ), -/* PCMCIA_DEVICE_MANF_CARD(0x021b, 0x0202), conflict with axnet_cs */ PCMCIA_DEVICE_MANF_CARD (0x026f ,0x0300 ),PCMCIA_DEVICE_MANF_CARD (0x026f ,0x0307 ), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030a),
drivers/net/phy/mdio_bus.c +2 -2
@@ -49,13 +49,13 @@ int mdiobus_register(struct mii_bus *bus)int i;int err =0 ; -mutex_init (&bus->mdio_lock); -if (NULL == bus ||NULL == bus->name ||NULL == bus->read ||NULL == bus->write)return -EINVAL ; +mutex_init (&bus->mdio_lock); +if (bus->reset) bus->reset (bus);
drivers/net/sis190.c +10 -5
@@ -1633,13 +1633,18 @@ static inline void sis190_init_rxfilter(struct net_device *dev)static int __devinit sis190_get_mac_addr (struct pci_dev *pdev,struct net_device *dev) { -u8 from; +int rc; + + rc =sis190_get_mac_addr_from_eeprom (pdev, dev); +if (rc <0 ) { +u8 reg; -pci_read_config_byte (pdev,0x73 , &from); +pci_read_config_byte (pdev,0x73 , ®); -return (from &0x00000001 ) ? -sis190_get_mac_addr_from_apc (pdev, dev) : -sis190_get_mac_addr_from_eeprom (pdev, dev); +if (reg &0x00000001 ) + rc =sis190_get_mac_addr_from_apc (pdev, dev); + } +return rc; }static void sis190_set_speed_auto (struct net_device *dev)
drivers/net/tlan.c +32 -32
256 lines not on this page · raw message
drivers/net/tulip/uli526x.c +11 -1
@@ -482,9 +482,11 @@ static void uli526x_init(struct net_device *dev)struct uli526x_board_info *db =netdev_priv (dev);unsigned long ioaddr = db->ioaddr;u8 phy_tmp; +u8 timeout;u16 phy_value;u16 phy_reg_reset; +ULI526X_DBUG (0 ,"uli526x_init()" ,0 );/* Reset M526x MAC controller */
@@ -509,11 +511,19 @@ static void uli526x_init(struct net_device *dev)/* Parser SROM and media mode */ db->media_mode = uli526x_media_mode; -/* Phyxcer capability setting */ +/* phyxcer capability setting */ phy_reg_reset =phy_read (db->ioaddr, db->phy_addr,0 , db->chip_id); phy_reg_reset = (phy_reg_reset |0x8000 );phy_write (db->ioaddr, db->phy_addr,0 , phy_reg_reset, db->chip_id); + +/* See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management +* functions") or phy data sheet for details on phy reset +*/ udelay (500 ); + timeout =10 ; +while (timeout-- && +phy_read (db->ioaddr, db->phy_addr,0 , db->chip_id) &0x8000 ) +udelay (100 );/* Process Phyxcer Media Mode */ uli526x_set_phyxcer (db);
drivers/net/virtio_net.c +1 -1
@@ -361,6 +361,7 @@ static int virtnet_probe(struct virtio_device *vdev)netif_napi_add (dev, &vi->napi, virtnet_poll, napi_weight); vi->dev = dev; vi->vdev = vdev; + vdev->priv = vi;/* We expect two virtqueues, receive then send. */ vi->rvq = vdev->config->find_vq (vdev,0 , skb_recv_done);
@@ -395,7 +396,6 @@ static int virtnet_probe(struct virtio_device *vdev) }pr_debug ("virtnet: registered device %s\n" , dev->name); - vdev->priv = vi;return 0 ; unregister:
drivers/s390/net/claw.c +18 -21
@@ -1851,8 +1851,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid) } }/* See how many write buffers are required to hold this data */ - numBuffers= ( skb->len + privptr->p_env->write_size -1 ) / - ( privptr->p_env->write_size); + numBuffers =DIV_ROUND_UP (skb->len, privptr->p_env->write_size);/* If that number of buffers isn't available, give up for now */ if (privptr->write_free_count < numBuffers ||
@@ -2114,8 +2113,7 @@ init_ccw_bk(struct net_device *dev)*/ ccw_blocks_perpage=PAGE_SIZE /CCWBK_SIZE ; ccw_pages_required= - (ccw_blocks_required+ccw_blocks_perpage -1 ) / - ccw_blocks_perpage; +DIV_ROUND_UP (ccw_blocks_required, ccw_blocks_perpage);#ifdef DEBUGMSG printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n",
@@ -2131,30 +2129,29 @@ init_ccw_bk(struct net_device *dev)* provide good performance. With packing buffers support 32k * buffers are used. */ -if (privptr->p_env->read_size <PAGE_SIZE ) { - claw_reads_perpage=PAGE_SIZE / privptr->p_env->read_size; - claw_read_pages= (privptr->p_env->read_buffers + - claw_reads_perpage -1 ) / claw_reads_perpage; +if (privptr->p_env->read_size <PAGE_SIZE ) { + claw_reads_perpage =PAGE_SIZE / privptr->p_env->read_size; + claw_read_pages =DIV_ROUND_UP (privptr->p_env->read_buffers, + claw_reads_perpage); }else {/* > or equal */ - privptr->p_buff_pages_perread= - (privptr->p_env->read_size +PAGE_SIZE -1 ) /PAGE_SIZE ; - claw_read_pages= - privptr->p_env->read_buffers * privptr->p_buff_pages_perread; + privptr->p_buff_pages_perread = +DIV_ROUND_UP (privptr->p_env->read_size,PAGE_SIZE ); + claw_read_pages = privptr->p_env->read_buffers * + privptr->p_buff_pages_perread; }if (privptr->p_env->write_size <PAGE_SIZE ) { - claw_writes_perpage= -PAGE_SIZE / privptr->p_env->write_size; - claw_write_pages= - (privptr->p_env->write_buffers + claw_writes_perpage -1 ) / - claw_writes_perpage; + claw_writes_perpage = +PAGE_SIZE / privptr->p_env->write_size; + claw_write_pages =DIV_ROUND_UP (privptr->p_env->write_buffers, + claw_writes_perpage); }else {/* > or equal */ - privptr->p_buff_pages_perwrite= - (privptr->p_env->read_size +PAGE_SIZE -1 ) /PAGE_SIZE ; - claw_write_pages= - privptr->p_env->write_buffers * privptr->p_buff_pages_perwrite; + privptr->p_buff_pages_perwrite = +DIV_ROUND_UP (privptr->p_env->read_size,PAGE_SIZE ); + claw_write_pages = privptr->p_env->write_buffers * + privptr->p_buff_pages_perwrite; }#ifdef DEBUGMSG if (privptr->p_env->read_size <PAGE_SIZE ) {
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Wed, 20 Feb 2008 11:55:57 -0500
Quoted 4 lines
Note: this is based off of Linus's latest commit (
5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous submissions are now upstream (thanks!).
The whole point of my not rebasing net-2.6 is so that you can always use it as a base.
With what you've giving me now I either have to:
1) Pull in Linus's tree to net-2.6, then pull from you.
2) Pull in directly from you to get it all.
The whole point of my not touching or rebasing net-2.6 is so that everyonce can simply use it as a base and just keep working relative to it.
If you have some need for upstream stuff outside networking (f.e. some ACPI bug prevents interrupts from working or there is some build failure), you can clone Linus's tree and pull net-2.6 and your driver bits into there for building and testing.
Thanks for your consideration, I'm trying to show you mine by giving everyone a relatively stable tree in which all networking development can occur.
Quoted 8 lines · David Miller
From: Jeff Garzik <[email protected]>
Date: Wed, 20 Feb 2008 11:55:57 -0500Quoted 4 lines
Note: this is based off of Linus's latest commit (
5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous submissions are now upstream (thanks!).
Quoted 8 lines
The whole point of my not rebasing net-2.6 is so that you can always use it as a base.
With what you've giving me now I either have to:
1) Pull in Linus's tree to net-2.6, then pull from you.
2) Pull in directly from you to get it all.
Why are either of those a problem?
--b.
David Miller
maintainerFrom: "J. Bruce Fields" <[email protected]>
Date: Wed, 20 Feb 2008 16:23:02 -0500
Quoted 12 lines · David Miller
Quoted 11 lines
From: Jeff Garzik <[email protected]>
Date: Wed, 20 Feb 2008 11:55:57 -0500Quoted 4 lines
Note: this is based off of Linus's latest commit (
5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous submissions are now upstream (thanks!).The whole point of my not rebasing net-2.6 is so that you can always use it as a base.
Quoted 7 lines
Quoted 5 lines
With what you've giving me now I either have to:
1) Pull in Linus's tree to net-2.6, then pull from you.
2) Pull in directly from you to get it all.
Why are either of those a problem?
Because it forces me to pull Linus's upstream into net-2.6, I don't have any choice in the matter.
Quoted 17 lines · David Miller
From: "J. Bruce Fields" <[email protected]>
Date: Wed, 20 Feb 2008 16:23:02 -0500Quoted 14 lines · David Miller
Quoted 13 lines
From: Jeff Garzik <[email protected]>
Date: Wed, 20 Feb 2008 11:55:57 -0500Quoted 4 lines
Note: this is based off of Linus's latest commit (
5d9c4a7de64d398604a978d267a6987f1f4025b7), since all my previous submissions are now upstream (thanks!).The whole point of my not rebasing net-2.6 is so that you can always use it as a base.
With what you've giving me now I either have to:
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
1) Pull in Linus's tree to net-2.6, then pull from you.
2) Pull in directly from you to get it all.
Why are either of those a problem?
Because it forces me to pull Linus's upstream into net-2.6, I don't have any choice in the matter.
Right. I'm wondering what the problems are that you see with that.
The advantages include earlier warning of merge problems, and avoidance of duplicate commits--if Jeff's done work that depends on patches that already upstream, then he either does that work against upstream, or includes backported patches in the branch he asks you to pull, and you end up with both the original and the backported patch. Which isn't the end of the world, but the resulting history seems messier than necessary.
Or I guess you could both wait to do this merge until you're ready to pull in Linus's latest?
For non-git-using testers there may be an advantage to always keeping a tree based on the latest tagged release, as it may simplify providing them with patches in some cases. But if the goal is to provide a basis for other maintainer's work, I'd've thought the best policy would be just to track the tip of every relevant branch (which includes Linus's in this case).
--b.
David Miller
maintainerFrom: "J. Bruce Fields" <[email protected]>
Date: Wed, 20 Feb 2008 17:25:30 -0500
Quoted 10 lines
The advantages include earlier warning of merge problems, and avoidance of duplicate commits--if Jeff's done work that depends on patches that already upstream, then he either does that work against upstream, or includes backported patches in the branch he asks you to pull, and you end up with both the original and the backported patch. Which isn't the end of the world, but the resulting history seems messier than necessary.
Or I guess you could both wait to do this merge until you're ready to pull in Linus's latest?
I do a test pull and build of net-2.6 into Linus's current tree before I send Linus a pull request.
If any non-trivial merges are necessary, which hasn't happened yet at all, I would then do a merge into my net-2.6 tree and resolve the conflicts.
There is no reason for someone downstream of net-2.6 to do this.
David Miller <[email protected]> :
[...]
Quoted 2 lines
Because it forces me to pull Linus's upstream into net-2.6, I don't have any choice in the matter.
Jeff's choice is a bit surprizing. That being said, it would had been nice to fast-forward net-2.6 from a442585952f137bd4cdb1f2f3166e4157d383b82 to Linus's upstream before applying the content of 12aa343add3eced38a44bdb612b35fdf634d918c in order to keep the drift with Linus's branch to a minimum during the bugfix cycle.
Signature · 1 line
Ueimor
David Miller
maintainerFrom: Francois Romieu <[email protected]>
Date: Wed, 20 Feb 2008 23:40:53 +0100
Quoted 10 lines
David Miller <[email protected]> :
[...]Quoted 2 lines
Because it forces me to pull Linus's upstream into net-2.6, I don't have any choice in the matter.
Jeff's choice is a bit surprizing. That being said, it would had been nice to fast-forward net-2.6 from
a442585952f137bd4cdb1f2f3166e4157d383b82to Linus's upstream before applying the content of12aa343add3eced38a44bdb612b35fdf634d918cin order to keep the drift with Linus's branch to a minimum during the bugfix cycle.
Keep in mind there are also pending fixes in my net-2.6 tree which Linus hasn't pulled in yet as well.
I watch Linus's tree closely, and I'll see any potential merge issue long before it matters, and I always double check before pushing stuff out to him.
My job as tree master is to deal with all the merge hassles, should they occur. But up until now everything networking has gone through my tree and everything is fine.
The net-2.6 tree isn't even a week old. I planned to pull Linus's tree in right before I leave for a short trip tomorrow afternoon. I'm really not being allowed to make that choice by how these changes are being merged to me.
Heck, Jeff even thanked me for making my net-2.6 tree stable and not rebasing, so his method of merging this stuff is doubly surprising for me.
Jeff, I really don't want to pull that tree in. Please trust me as your upstream to handle merging issues, as needed.
Thanks!
Quoted 2 lines · David Miller
Jeff, I really don't want to pull that tree in. Please trust me as your upstream to handle merging issues, as needed.
I trust you... Otherwise I wouldn't have volunteered to move my upstream from Linus to you :)
My main issues/motivations were:
* quite simply, just force of habit: I'm used to basing off of a recent Linus tree, to guarantee build&boot testing against the latest.
* worry about testing against a too-old tree, where non-networking fixes may have a relevant impact on my to-be-pushed netdrvr fixes.
But in this case it's fair to say there are no such issues, and it was mainly just out of habit.
So (as you saw in last email)... rebased and resend.
Jeff
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Sun, 24 Feb 2008 00:48:54 -0500
Quoted 2 lines
I trust you... Otherwise I wouldn't have volunteered to move my upstream from Linus to you :)
...
Quoted 1 line
So (as you saw in last email)... rebased and resend.
Thanks :)