[LV-k25-commit] Linux for the VAX architecture: Changes to 'vax4linus'

[Jan-Benedict G. <jb...@he...>]

 MAINTAINERS                        |    6 +++++
 drivers/acpi/ec.c                  |   17 ++++++++++++++
 drivers/atm/fore200e.c             |    2 -
 drivers/atm/iphase.c               |   12 +++++-----
 drivers/atm/lanai.c                |    1 
 drivers/i2c/busses/i2c-i801.c      |    4 +--
 drivers/i2c/busses/i2c-iop3xx.c    |    1 
 drivers/i2c/busses/i2c-mpc.c       |   11 ++++++---
 drivers/i2c/busses/i2c-mv64xxx.c   |   31 ++++++++++++++-------------
 drivers/i2c/busses/i2c-s3c2410.c   |    4 +--
 drivers/i2c/chips/isp1301_omap.c   |   42 ++++++++++++++++++-------------------
 drivers/i2c/chips/menelaus.c       |    3 --
 drivers/net/3c59x.c                |    1 
 drivers/net/ax88796.c              |    5 ++--
 drivers/net/bonding/bond_main.c    |   34 +++++++++++------------------
 drivers/net/e1000/e1000_ethtool.c  |    2 +
 drivers/net/e1000/e1000_hw.c       |    5 ++++
 drivers/net/e1000/e1000_hw.h       |    3 ++
 drivers/net/e1000/e1000_main.c     |    4 +++
 drivers/net/irda/irda-usb.c        |   24 ++++++++-------------
 drivers/net/myri10ge/myri10ge.c    |   25 +++++++++++++++-------
 drivers/net/natsemi.c              |    3 ++
 drivers/net/via-rhine.c            |    6 +++++
 drivers/net/wan/hdlc_fr.c          |    3 --
 drivers/net/xen-netfront.c         |    7 +++---
 include/linux/netdevice.h          |    2 +
 net/atm/lec.c                      |    1 
 net/bridge/br_device.c             |    2 -
 net/bridge/br_if.c                 |   36 +++----------------------------
 net/core/dev.c                     |   39 ++++++++++++++++++++++++++++++++++
 net/dccp/ccid.c                    |    1 
 net/dccp/feat.c                    |   14 ++++++++----
 net/ipv4/ip_output.c               |    1 
 net/ipv4/ipconfig.c                |    6 ++---
 net/ipv4/ipvs/ip_vs_ctl.c          |    3 --
 net/ipv4/netfilter/ipt_CLUSTERIP.c |    1 
 net/ipv6/tcp_ipv6.c                |    1 
 net/sched/act_police.c             |    1 
 net/sunrpc/auth_gss/svcauth_gss.c  |    1 
 net/tipc/port.c                    |    1 
 net/xfrm/xfrm_policy.c             |    3 --
 net/xfrm/xfrm_state.c              |    3 --
 42 files changed, 217 insertions(+), 155 deletions(-)

New commits:
commit 5cc3cf83d4f50e146980d6cbd289d4b70d07e806
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5cc3cf83d4f50e146980d6cbd289d4b70d07e806
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5cc3cf83d4f50e146980d6cbd289d4b70d07e806
Merge: 082f411e2074d275746edc88953893469045a4df 3b993e8bee32d6dfe04df560eda8e1aff6248a22
Author: Jan-Benedict Glaw <jb...@jb...>
Date:   Tue Aug 14 18:57:27 2007 +0200

    Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into vax4linus

commit 3b993e8bee32d6dfe04df560eda8e1aff6248a22
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3b993e8bee32d6dfe04df560eda8e1aff6248a22
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3b993e8bee32d6dfe04df560eda8e1aff6248a22
Merge: ab3c556de19b1888b0830ef066524884d4788131 b5d0b4ba389711183b5af71438fe21b40ee32d6d
Author: Linus Torvalds <tor...@wo...>
Date:   Tue Aug 14 09:52:12 2007 -0700

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c-s3c2410: Build fix
      i2c/menelaus: Build fix
      i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang
      i2c-mpc: Don't disable I2C module on stop condition
      i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class
      i2c/isp1301_omap: Build fixes, whitespace
      i2c-mpc: Pass correct dev_id to free_irq on error path
      i2c-i801: Typo: erroneous

commit b5d0b4ba389711183b5af71438fe21b40ee32d6d
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b5d0b4ba389711183b5af71438fe21b40ee32d6d
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b5d0b4ba389711183b5af71438fe21b40ee32d6d
Author: Ben Dooks <be...@fl...>
Date:   Tue Aug 14 18:37:15 2007 +0200

    i2c-s3c2410: Build fix
    
    Fixup the include files after the arch moves that
    where included in 2.6.23.
    
    Signed-off-by: Ben Dooks <ben...@fl...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit c1147cc6d18389f6530bae27741b9b2665e862e6
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c1147cc6d18389f6530bae27741b9b2665e862e6
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c1147cc6d18389f6530bae27741b9b2665e862e6
Author: David Brownell <da...@pa...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c/menelaus: Build fix
    
    Fix Menelaus build error, and remove needless "#define DEBUG".
    
    Signed-off-by: David Brownell <dbr...@us...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit a07ad1cc0300931bfd76bfcd2da3ddad743f4a89
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a07ad1cc0300931bfd76bfcd2da3ddad743f4a89
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a07ad1cc0300931bfd76bfcd2da3ddad743f4a89
Author: Dale Farnsworth <da...@fa...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang
    
    Under certain conditions, the mv64xxx I2C bus can hang preventing
    further operation.  To make the driver more robust, we now reset
    the I2C hardware and the driver state machine when such hangs are
    detected.
    
    Signed-off-by: Dale Farnsworth <da...@fa...>
    Acked-by: Mark A. Greer <mg...@mv...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit 5af0e07f87e7d9be2a9db514af1e338341240f6d
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5af0e07f87e7d9be2a9db514af1e338341240f6d
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5af0e07f87e7d9be2a9db514af1e338341240f6d
Author: Domen Puncer <dom...@te...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c-mpc: Don't disable I2C module on stop condition
    
    Disabling module on stop doesn't work on some CPUs (ie. mpc8241,
    as reported by Guennadi Liakhovetski), so remove that.
    
    Disable I2C module on errors/interrupts to prevent it from
    locking up on mpc5200b.
    
    Signed-off-by: Domen Puncer <dom...@te...>
    Acked-by: Guennadi Liakhovetski <g.l...@gm...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit 432ca994bf7107e88916fd9606ca7402a4571359
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=432ca994bf7107e88916fd9606ca7402a4571359
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=432ca994bf7107e88916fd9606ca7402a4571359
Author: Arnaud Patard <arn...@rt...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class
    
    In order to be able to use sensors on the IOP3xx SoCs, one needs to set
    the adapter class to I2C_CLASS_HWMON.
    
    Signed-off-by: Arnaud Patard <arn...@rt...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit 25da383d26a1dcca4f0205769a24e5eac79c6d35
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=25da383d26a1dcca4f0205769a24e5eac79c6d35
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=25da383d26a1dcca4f0205769a24e5eac79c6d35
Author: David Brownell <da...@pa...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c/isp1301_omap: Build fixes, whitespace
    
    Build fixes for isp1301_omap driver.  I think an earlier version
    of this must have gotten lost somewhere, or maybe it only went
    into the Linux-OMAP tree.
    
    Also, some whitespace fixes to bring this more into sync with the
    version of this found in the Linux-OMAP tree.  (That version has
    updates for the OTG controller on the OMAP 1710 which break that
    functionality on OMAP 161x boards like the H2, so merging all of
    it is not currently an option.)
    
    Signed-off-by: David Brownell <dbr...@us...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit 322454a65371477bed0eb1d189c50d781ebd7f85
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=322454a65371477bed0eb1d189c50d781ebd7f85
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=322454a65371477bed0eb1d189c50d781ebd7f85
Author: Scott Wood <sco...@fr...>
Date:   Tue Aug 14 18:37:14 2007 +0200

    i2c-mpc: Pass correct dev_id to free_irq on error path
    
    Signed-off-by: Scott Wood <sco...@fr...>
    Signed-off-by: Jean Delvare <kh...@li...>

commit 002cf63191eb8b68b7fed48f014b87c456188acc
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=002cf63191eb8b68b7fed48f014b87c456188acc
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=002cf63191eb8b68b7fed48f014b87c456188acc
Author: Jean Delvare <kh...@li...>
Date:   Tue Aug 14 18:37:13 2007 +0200

    i2c-i801: Typo: erroneous
    
    Signed-off-by: Jean Delvare <kh...@li...>

commit ab3c556de19b1888b0830ef066524884d4788131
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ab3c556de19b1888b0830ef066524884d4788131
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ab3c556de19b1888b0830ef066524884d4788131
Merge: c4e7ac5d427a48b91752671523f39a04e63e12ff cae7ca3d3de48851e929de9469397749638df779
Author: Linus Torvalds <tor...@wo...>
Date:   Tue Aug 14 09:31:19 2007 -0700

    Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [IPVS]: Use IP_VS_WAIT_WHILE when encessary.
      [NET]: Share correct feature code between bridging and bonding
      [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc
      [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc
      [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc
      [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm()
      [DCCP]: fix theoretical ccids_{read,write}_lock() race
      [XFRM]: Clean up duplicate includes in net/xfrm/
      [TIPC]: Clean up duplicate includes in net/tipc/
      [SUNRPC]: Clean up duplicate includes in net/sunrpc/
      [PKT_SCHED]: Clean up duplicate includes in net/sched/
      [IPV6]: Clean up duplicate includes in net/ipv6/
      [IPV4]: Clean up duplicate includes in net/ipv4/
      [ATM]: Clean up duplicate includes in net/atm/
      [ATM]: Clean up duplicate includes in drivers/atm/
      [IPCONFIG]: ip_auto_config fix
      [ATM]: fore200e_param_bs_queue() must be __devinit

commit c4e7ac5d427a48b91752671523f39a04e63e12ff
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c4e7ac5d427a48b91752671523f39a04e63e12ff
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c4e7ac5d427a48b91752671523f39a04e63e12ff
Merge: c019b1933015ee31366eeaa085bad3ee9516991c ce57a02c64052c3f1c62f30a902a937e6c316d88
Author: Linus Torvalds <tor...@wo...>
Date:   Tue Aug 14 09:30:42 2007 -0700

    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      e1000: Add device IDs of new 82571 board variants
      xen-netfront: Avoid deref'ing skbafter it is potentially freed.
      3c59x maintainer
      3c59x: fix duplex configuration
      natsemi: fix netdev error acounting
      ax88796 printk fixes
      myri10ge: Use the pause counter to avoid a needless device reset
      via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access

commit ce57a02c64052c3f1c62f30a902a937e6c316d88
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ce57a02c64052c3f1c62f30a902a937e6c316d88
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ce57a02c64052c3f1c62f30a902a937e6c316d88
Author: Auke Kok <auk...@in...>
Date:   Thu Aug 9 14:09:34 2007 -0700

    e1000: Add device IDs of new 82571 board variants
    
    This patch adds support for 2 new board variants:
    - A Quad port fiber 82571 board
    - A blade version of the 82571 quad copper board
    
    Signed-off-by: Auke Kok <auk...@in...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit cae7ca3d3de48851e929de9469397749638df779
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cae7ca3d3de48851e929de9469397749638df779
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cae7ca3d3de48851e929de9469397749638df779
Author: Heiko Carstens <hei...@de...>
Date:   Fri Aug 10 15:50:30 2007 -0700

    [IPVS]: Use IP_VS_WAIT_WHILE when encessary.
    
    For architectures that don't have a volatile atomic_ts constructs like
    while (atomic_read(&something)); might result in endless loops since a
    barrier() is missing which forces the compiler to generate code that
    actually reads memory contents.
    Fix this in ipvs by using the IP_VS_WAIT_WHILE macro which resolves to
    while (expr) { cpu_relax(); }
    (why isn't this open coded btw?)
    
    Signed-off-by: Heiko Carstens <hei...@de...>
    Signed-off-by: Simon Horman <ho...@ve...>
    Signed-off-by: David S. Miller <da...@da...>

commit 7f353bf29e162459f2f1e2ca25e41011fae65241
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7f353bf29e162459f2f1e2ca25e41011fae65241
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7f353bf29e162459f2f1e2ca25e41011fae65241
Author: Herbert Xu <he...@go...>
Date:   Fri Aug 10 15:47:58 2007 -0700

    [NET]: Share correct feature code between bridging and bonding
    
    http://bugzilla.kernel.org/show_bug.cgi?id=8797 shows that the
    bonding driver may produce bogus combinations of the checksum
    flags and SG/TSO.
    
    For example, if you bond devices with NETIF_F_HW_CSUM and
    NETIF_F_IP_CSUM you'll end up with a bonding device that
    has neither flag set.  If both have TSO then this produces
    an illegal combination.
    
    The bridge device on the other hand has the correct code to
    deal with this.
    
    In fact, the same code can be used for both.  So this patch
    moves that logic into net/core/dev.c and uses it for both
    bonding and bridging.
    
    In the process I've made small adjustments such as only
    setting GSO_ROBUST if at least one constituent device
    supports it.
    
    Signed-off-by: Herbert Xu <he...@go...>
    Signed-off-by: David S. Miller <da...@da...>

commit f71417614d63932cf56ed98a0947568d6259d11e
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f71417614d63932cf56ed98a0947568d6259d11e
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f71417614d63932cf56ed98a0947568d6259d11e
Author: Mariusz Kozlowski <m.k...@tu...>
Date:   Fri Aug 10 15:26:18 2007 -0700

    [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc
    
     drivers/atm/iphase.c | 111508 -> 111431 (-77 bytes)
     drivers/atm/iphase.o | 254740 -> 254260 (-480 bytes)
    
    Signed-off-by: Mariusz Kozlowski <m.k...@tu...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 48e3eeb1a1a89a3ea256cf6d3c898e753787cfaa
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=48e3eeb1a1a89a3ea256cf6d3c898e753787cfaa
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=48e3eeb1a1a89a3ea256cf6d3c898e753787cfaa
Author: Mariusz Kozlowski <m.k...@tu...>
Date:   Fri Aug 10 15:25:40 2007 -0700

    [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc
    
     drivers/net/irda/irda-usb.c | 59694 -> 59541 (-153 bytes)
     drivers/net/irda/irda-usb.o | 170588 -> 169256 (-1332 bytes)
    
    Signed-off-by: Mariusz Kozlowski <m.k...@tu...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 1ee325438cdbe374ebea6e3d2f19204072c15038
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1ee325438cdbe374ebea6e3d2f19204072c15038
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1ee325438cdbe374ebea6e3d2f19204072c15038
Author: Mariusz Kozlowski <m.k...@tu...>
Date:   Fri Aug 10 15:24:50 2007 -0700

    [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc
    
     drivers/net/wan/hdlc_fr.c | 31260 -> 31223 (-37 bytes)
     drivers/net/wan/hdlc_fr.o | 144872 -> 144728 (-144 bytes)
    
    Signed-off-by: Mariusz Kozlowski <m.k...@tu...>
    Acked-by: Krzysztof Halasa <kh...@pm...>
    Signed-off-by: Andrew Morton <ak...@li...>

commit e576de82ee628f68e5a44527c7ee99eadeab2e62
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e576de82ee628f68e5a44527c7ee99eadeab2e62
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e576de82ee628f68e5a44527c7ee99eadeab2e62
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:23:54 2007 -0700

    [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm()
    
    There's a memory leak in net/dccp/feat.c::dccp_feat_empty_confirm().  If we
    hit the 'default:' case of the 'switch' statement, then we return without
    freeing 'opt', thus leaking 'struct dccp_opt_pend' bytes.
    
    The leak is fixed easily enough by adding a kfree(opt); before the return
    statement.
    
    The patch also changes the layout of the 'switch' to be more in line with
    CodingStyle.
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Acked-by: Ian McDonald <ian...@ja...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit d725fdc8027a4cd961f58d92917fbb91b171abfa
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d725fdc8027a4cd961f58d92917fbb91b171abfa
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d725fdc8027a4cd961f58d92917fbb91b171abfa
Author: Oleg Nesterov <ol...@tv...>
Date:   Fri Aug 10 15:21:17 2007 -0700

    [DCCP]: fix theoretical ccids_{read,write}_lock() race
    
    Make sure that spin_unlock_wait() is properly ordered wrt atomic_inc().
    
    (akpm: can't we convert this code to use rwlocks?)
    
    Signed-off-by: Oleg Nesterov <ol...@tv...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit b5890d8ba47741425fe3c0d753e1b57bc0561b7b
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b5890d8ba47741425fe3c0d753e1b57bc0561b7b
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b5890d8ba47741425fe3c0d753e1b57bc0561b7b
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:20:21 2007 -0700

    [XFRM]: Clean up duplicate includes in net/xfrm/
    
    This patch cleans up duplicate includes in
    	net/xfrm/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:19:43 2007 -0700

    [TIPC]: Clean up duplicate includes in net/tipc/
    
    This patch cleans up duplicate includes in
    	net/tipc/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 08dd2e29468d55f67fa346ede07ddfc58a60536b
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=08dd2e29468d55f67fa346ede07ddfc58a60536b
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=08dd2e29468d55f67fa346ede07ddfc58a60536b
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:19:09 2007 -0700

    [SUNRPC]: Clean up duplicate includes in net/sunrpc/
    
    This patch cleans up duplicate includes in
    	net/sunrpc/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 0a26f4cdc207db14a8e7192bac5a7c84d9e2390a
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0a26f4cdc207db14a8e7192bac5a7c84d9e2390a
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0a26f4cdc207db14a8e7192bac5a7c84d9e2390a
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:18:31 2007 -0700

    [PKT_SCHED]: Clean up duplicate includes in net/sched/
    
    This patch cleans up duplicate includes in
    	net/sched/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 703310e645c639a84e7f4b35d8a508acde9ef360
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=703310e645c639a84e7f4b35d8a508acde9ef360
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=703310e645c639a84e7f4b35d8a508acde9ef360
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:17:58 2007 -0700

    [IPV6]: Clean up duplicate includes in net/ipv6/
    
    This patch cleans up duplicate includes in
    	net/ipv6/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit f49f9967b263cc88b48d912172afdc621bcb0a3c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f49f9967b263cc88b48d912172afdc621bcb0a3c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f49f9967b263cc88b48d912172afdc621bcb0a3c
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:17:24 2007 -0700

    [IPV4]: Clean up duplicate includes in net/ipv4/
    
    This patch cleans up duplicate includes in
    	net/ipv4/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 6869a35b365c027b7acf50585c5bb34e34d4c41c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6869a35b365c027b7acf50585c5bb34e34d4c41c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6869a35b365c027b7acf50585c5bb34e34d4c41c
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:16:42 2007 -0700

    [ATM]: Clean up duplicate includes in net/atm/
    
    This patch cleans up duplicate includes in
    	net/atm/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit af3502184aee8a0af6da8678e84c3d5bc5cdb83f
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=af3502184aee8a0af6da8678e84c3d5bc5cdb83f
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=af3502184aee8a0af6da8678e84c3d5bc5cdb83f
Author: Jesper Juhl <jes...@gm...>
Date:   Fri Aug 10 15:15:55 2007 -0700

    [ATM]: Clean up duplicate includes in drivers/atm/
    
    This patch cleans up duplicate includes in
    	drivers/atm/
    
    Signed-off-by: Jesper Juhl <jes...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit dcbdc93c6c64daf20622d6deae774d1e740efb8d
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dcbdc93c6c64daf20622d6deae774d1e740efb8d
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dcbdc93c6c64daf20622d6deae774d1e740efb8d
Author: Joakim Tjernlund <joa...@tr...>
Date:   Fri Aug 10 15:14:54 2007 -0700

    [IPCONFIG]: ip_auto_config fix
    
    The following commandline:
    
     root=/dev/mtdblock6 rw rootfstype=jffs2 ip=192.168.1.10:::255.255.255.0:localhost.localdomain:eth1:off console=ttyS0,115200
    
    makes ip_auto_config fall back to DHCP and complain "IP-Config: Incomplete
    network configuration information." depending on if CONFIG_IP_PNP_DHCP is
    set or not.
    
    The only way I can make ip_auto_config accept my IP config is to add an
    entry for the server IP:
    
    ip=192.168.1.10:192.168.1.15::255.255.255.0:localhost.localdomain:eth1:off
    
    I think this is a bug since I am not using a NFS root FS.
    
    The following patch fixes the above problem.
    
    From: Andrew Morton <ak...@li...>
    
    Davem said (in February!):
    
      Well, first of all the change in question is not in 2.4.x either.  I just
      checked the current 2.4.x GIT tree and the test is exactly:
    
    	if (ic_myaddr == INADDR_NONE ||
    #ifdef CONFIG_ROOT_NFS
    	    (MAJOR(ROOT_DEV) == UNNAMED_MAJOR
    	     && root_server_addr == INADDR_NONE
    	     && ic_servaddr == INADDR_NONE) ||
    #endif
    	    ic_first_dev->next) {
    
      which matches 2.6.x
    
      I even checked 2.4.x when it was branched for 2.5.x and the test was the
      same at the point in time too.
    
      Looking at the proposed change a bit it appears that it is probably
      correct, as it's trying to check that ROOT_DEV is nfs root.  But if it is
      correct then the UNNAMED_MAJOR comparison in the same code block should be
      removed as it becomes superfluous.
    
      I'm happy to apply this patch with that modification made.
    
    Signed-off-by: Joakim Tjernlund <joa...@tr...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 8aee929eda10b2502fd76c0bf2003f89f7992820
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8aee929eda10b2502fd76c0bf2003f89f7992820
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8aee929eda10b2502fd76c0bf2003f89f7992820
Author: Adrian Bunk <bu...@st...>
Date:   Fri Aug 10 15:14:18 2007 -0700

    [ATM]: fore200e_param_bs_queue() must be __devinit
    
    WARNING: drivers/built-in.o(.text+0x6203bb): Section mismatch: reference to .init.text:fore200e_param_bs_queue (between 'fore200e_initialize' and 'fore200e_monitor_putc')
    
    Signed-off-by: Adrian Bunk <bu...@st...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit 10a273a67343e1f317652d69b09a212ee0284b44
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=10a273a67343e1f317652d69b09a212ee0284b44
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=10a273a67343e1f317652d69b09a212ee0284b44
Author: Jeremy Fitzhardinge <je...@go...>
Date:   Mon Aug 13 12:54:37 2007 -0700

    xen-netfront: Avoid deref'ing skbafter it is potentially freed.
    
    xennet_tx_bug_gc can free the skb before we use it, so make sure we don't.
    
    Signed-off-by: Keir Fraser <ke...@xe...>
    Signed-off-by: Jeremy Fitzhardinge <je...@xe...>
    Cc: Jeff Garzik <je...@ga...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit a6d89915aa668776494fec8568d46aa6043ff848
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a6d89915aa668776494fec8568d46aa6043ff848
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a6d89915aa668776494fec8568d46aa6043ff848
Author: Steffen Klassert <kla...@ma...>
Date:   Fri Aug 10 14:05:27 2007 -0700

    3c59x maintainer
    
    Add 3c59x maintainer.
    
    Signed-off-by: Steffen Klassert <kla...@ma...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit 373492d0bdc66680ee598fd5a63e1914631b2522
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=373492d0bdc66680ee598fd5a63e1914631b2522
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=373492d0bdc66680ee598fd5a63e1914631b2522
Author: Steffen Klassert <kla...@ma...>
Date:   Fri Aug 10 14:05:26 2007 -0700

    3c59x: fix duplex configuration
    
    A special sequence of ifconfig up/down and plug/unplug the cable can break
    the duplex configuration of the driver.
    
    Setting
    vp->mii.full_duplex = vp->full_duplex
    in vortex_up should fix this.
    
    Addresses Bug 8575 3c59x duplex configuration broken
    http://bugzilla.kernel.org/show_bug.cgi?id=8575
    
    Cc: Martin Buck <mb-...@gr...>
    Signed-off-by: Steffen Klassert <kla...@ma...>
    Cc: Natalie Protasevich <pro...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit c76720cf7ba63a3d179b6da8675653c8b01b6c0b
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c76720cf7ba63a3d179b6da8675653c8b01b6c0b
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c76720cf7ba63a3d179b6da8675653c8b01b6c0b
Author: Andrew Morton <ak...@li...>
Date:   Fri Aug 10 14:05:23 2007 -0700

    natsemi: fix netdev error acounting
    
    When a detailed netdev error is counted, we also must account for it in the
    aggregated error count.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8106
    
    Cc: Tim Hockin <th...@ho...>
    Cc: Jeff Garzik <je...@ga...>
    Cc: Chongfeng Hu <lov...@ya...>
    Cc: Natalie Protasevich <pro...@gm...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit b4efe22cc987f4cd68ff838556580c0cc8c64cbc
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b4efe22cc987f4cd68ff838556580c0cc8c64cbc
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b4efe22cc987f4cd68ff838556580c0cc8c64cbc
Author: Andrew Morton <ak...@li...>
Date:   Fri Aug 10 14:05:21 2007 -0700

    ax88796 printk fixes
    
    drivers/net/ax88796.c: In function `ax_probe':
    drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 4)
    drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 5)
    
    resource_size_t isn't size_t.
    
    Cc: Jeff Garzik <je...@ga...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit 626fda948839fc2f488f527076b8f42b1b7a4687
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=626fda948839fc2f488f527076b8f42b1b7a4687
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=626fda948839fc2f488f527076b8f42b1b7a4687
Author: Brice Goglin <br...@my...>
Date:   Thu Aug 9 09:02:14 2007 +0200

    myri10ge: Use the pause counter to avoid a needless device reset
    
    Use the pause counter to avoid a needless device reset, and
    print a message telling the admin that our link partner is
    flow controlling us down to 0 pkts/sec.
    
    Signed-off-by: Brice Goglin <br...@my...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit b47157f00414f368f2847697ce48b76f1a5e5110
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b47157f00414f368f2847697ce48b76f1a5e5110
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b47157f00414f368f2847697ce48b76f1a5e5110
Author: Dustin Marquess <jai...@al...>
Date:   Fri Aug 10 14:05:15 2007 -0700

    via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access
    
    Patch to disable the rx_copybreak feature on hardware architectures that
    don't allow unaligned DMA access.
    
    #ifdef code taken from tulip_core.c.  Problem pointed out by Ivan
    Kokshaysky.
    
    Signed-off-by: Dustin Marquess <jai...@al...>
    Cc: Francois Romieu <ro...@fr...>
    Cc: Ivan Kokshaysky <in...@ju...>
    Cc: Jeff Garzik <je...@ga...>
    Signed-off-by: Andrew Morton <ak...@li...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit c019b1933015ee31366eeaa085bad3ee9516991c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c019b1933015ee31366eeaa085bad3ee9516991c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c019b1933015ee31366eeaa085bad3ee9516991c
Author: Alexey Starikovskiy <ast...@su...>
Date:   Tue Aug 14 01:03:42 2007 -0400

    ACPI: EC: Fix "no battery" regression
    
    Restore deleted call to register query methods.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=8886
    
    Signed-off-by: Alexey Starikovskiy <ast...@su...>
    Signed-off-by: Len Brown <len...@in...>