Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt

1 files changed, 25 insertions, 27 deletions

diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index a0e084223082..36c2725ec886 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -28,11 +28,11 @@ void tulip_media_task(struct work_struct *work)
         unsigned long flags;
 
         if (tulip_debug > 2) {
-                printk(KERN_DEBUG "%s: Media selection tick, %s, status %8.8x mode"
-                           " %8.8x SIA %8.8x %8.8x %8.8x %8.8x.\n",
-                           dev->name, medianame[dev->if_port], ioread32(ioaddr + CSR5),
-                           ioread32(ioaddr + CSR6), csr12, ioread32(ioaddr + CSR13),
-                           ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
+                printk(KERN_DEBUG "%s: Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n",
+                       dev->name, medianame[dev->if_port],
+                       ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR6),
+                       csr12, ioread32(ioaddr + CSR13),
+                       ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
         }
         switch (tp->chip_id) {
         case DC21140:
@@ -48,9 +48,9 @@ void tulip_media_task(struct work_struct *work)
                            Assume this a generic MII or SYM transceiver. */
                         next_tick = 60*HZ;
                         if (tulip_debug > 2)
-                                printk(KERN_DEBUG "%s: network media monitor CSR6 %8.8x "
-                                           "CSR12 0x%2.2x.\n",
-                                           dev->name, ioread32(ioaddr + CSR6), csr12 & 0xff);
+                                printk(KERN_DEBUG "%s: network media monitor CSR6 %08x CSR12 0x%02x\n",
+                                       dev->name,
+                                       ioread32(ioaddr + CSR6), csr12 & 0xff);
                         break;
                 }
                 mleaf = &tp->mtable->mleaf[tp->cur_index];
@@ -62,9 +62,8 @@ void tulip_media_task(struct work_struct *work)
                         s8 bitnum = p[offset];
                         if (p[offset+1] & 0x80) {
                                 if (tulip_debug > 1)
-                                        printk(KERN_DEBUG"%s: Transceiver monitor tick "
-                                                   "CSR12=%#2.2x, no media sense.\n",
-                                                   dev->name, csr12);
+                                        printk(KERN_DEBUG "%s: Transceiver monitor tick CSR12=%#02x, no media sense\n",
+                                               dev->name, csr12);
                                 if (mleaf->type == 4) {
                                         if (mleaf->media == 3 && (csr12 & 0x02))
                                                 goto select_next_media;
@@ -72,16 +71,16 @@ void tulip_media_task(struct work_struct *work)
                                 break;
                         }
                         if (tulip_debug > 2)
-                                printk(KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#2.2x"
-                                           " bit %d is %d, expecting %d.\n",
-                                           dev->name, csr12, (bitnum >> 1) & 7,
-                                           (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
-                                           (bitnum >= 0));
+                                printk(KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n",
+                                       dev->name, csr12, (bitnum >> 1) & 7,
+                                       (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
+                                       (bitnum >= 0));
                         /* Check that the specified bit has the proper value. */
                         if ((bitnum < 0) !=
                                 ((csr12 & (1 << ((bitnum >> 1) & 7))) != 0)) {
                                 if (tulip_debug > 2)
-                                        printk(KERN_DEBUG "%s: Link beat detected for %s.\n", dev->name,
+                                        printk(KERN_DEBUG "%s: Link beat detected for %s\n",
+                                               dev->name,
                                                medianame[mleaf->media & MEDIA_MASK]);
                                 if ((p[2] & 0x61) == 0x01)      /* Bogus Znyx board. */
                                         goto actually_mii;
@@ -100,9 +99,9 @@ void tulip_media_task(struct work_struct *work)
                         if (tulip_media_cap[dev->if_port] & MediaIsFD)
                                 goto select_next_media; /* Skip FD entries. */
                         if (tulip_debug > 1)
-                                printk(KERN_DEBUG "%s: No link beat on media %s,"
-                                       " trying transceiver type %s.\n",
-                                       dev->name, medianame[mleaf->media & MEDIA_MASK],
+                                printk(KERN_DEBUG "%s: No link beat on media %s, trying transceiver type %s\n",
+                                       dev->name,
+                                       medianame[mleaf->media & MEDIA_MASK],
                                        medianame[tp->mtable->mleaf[tp->cur_index].media]);
                         tulip_select_media(dev, 0);
                         /* Restart the transmit process. */
@@ -151,8 +150,8 @@ void mxic_timer(unsigned long data)
         int next_tick = 60*HZ;
 
         if (tulip_debug > 3) {
-                printk(KERN_INFO"%s: MXIC negotiation status %8.8x.\n", dev->name,
-                           ioread32(ioaddr + CSR12));
+                dev_info(&dev->dev, "MXIC negotiation status %08x\n",
+                         ioread32(ioaddr + CSR12));
         }
         if (next_tick) {
                 mod_timer(&tp->timer, RUN_AT(next_tick));
@@ -167,11 +166,10 @@ void comet_timer(unsigned long data)
         int next_tick = 60*HZ;
 
         if (tulip_debug > 1)
-                printk(KERN_DEBUG "%s: Comet link status %4.4x partner capability "
-                           "%4.4x.\n",
-                           dev->name,
-                           tulip_mdio_read(dev, tp->phys[0], 1),
-                           tulip_mdio_read(dev, tp->phys[0], 5));
+                printk(KERN_DEBUG "%s: Comet link status %04x partner capability %04x\n",
+                       dev->name,
+                       tulip_mdio_read(dev, tp->phys[0], 1),
+                       tulip_mdio_read(dev, tp->phys[0], 5));
         /* mod_timer synchronizes us with potential add_timer calls
          * from interrupts.
          */