1. 11 Jul, 2007 10 commits
  2. 10 Jul, 2007 30 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 4c75f741
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
        mmc: at91_mci: fix hanging and rework to match flowcharts
        mmc: at91_mci typo
        sdhci: Fix "Unexpected interrupt" handling
        mmc: fix silly copy-and-paste error
        mmc: move layer init and workqueue to core file
        mmc: refactor host class handling
        mmc: refactor bus operations
        sdhci: add ene controller id
        mmc: bounce requests for simple hosts
      4c75f741
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6ed911fb
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits)
        bonding/bond_main.c: make 2 functions static
        ps3: gigabit ethernet driver for PS3, take3
        [netdrvr] Fix dependencies for ax88796 ne2k clone driver
        eHEA: Capability flag for DLPAR support
        Remove sk98lin ethernet driver.
        sunhme.c:quattro_pci_find() must be __devinit
        bonding / ipv6: no addrconf for slaves separately from master
        atl1: remove write-only var in tx handler
        macmace: use "unsigned long flags;"
        Cleanup usbnet_probe() return value handling
        netxen: deinline and sparse fix
        eeprom_93cx6: shorten pulse timing to match spec (bis)
        phylib: Add Marvell 88E1112 phy id
        phylib: cleanup marvell.c a bit
        AX88796 network driver
        IOC3: Switch to pci refcounting safe APIs
        e100: Fix Tyan motherboard e100 not receiving IPMI commands
        QE Ethernet driver writes to wrong register to mask interrupts
        rrunner.c:rr_init() must be __devinit
        tokenring/3c359.c:xl_init() must be __devinit
        ...
      6ed911fb
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 64b853aa
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (32 commits)
        [libata] sata_mv: print out additional chip info during probe
        [libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info
        [libata] AHCI: Add support for Marvell AHCI-like chips (initially 6145)
        [libata] Clean up driver udma_mask initializers
        libata: Support chips with 64K PRD quirk
        Add a PCI ID for santa rosa's PATA controller.
        sata_sil24: sil24_interrupt() micro-optimisation
        Add irq_flags to struct pata_platform_info
        sata_promise: cleanups
        [libata] pata_ixp4xx: kill unused var
        ata_piix: fix pio/mwdma programming
        [libata] ahci: minor internal cleanups
        [ATA] Add named constant for ATAPI command DEVICE RESET
        [libata] sata_sx4, sata_via: minor documentation updates
        [libata] ahci: minor internal cleanups
        [libata] ahci: Factor out SATA port init into a separate function
        [libata] pata_sil680: minor cleanups from benh
        [libata] sata_sx4: named constant cleanup
        [libata] pata_ixp4xx: convert to new EH
        [libata] pdc_adma: Reorder initializers with a couple structs
        ...
      64b853aa
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 0f166396
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (62 commits)
        [MIPS] PNX8550: Cleanup proc code.
        [MIPS] WRPPMC: Fix build.
        [MIPS] Yosemite: Fix modpost warnings.
        [MIPS] Change names of local variables to silence sparse
        [MIPS] SB1: Fix modpost warning.
        [MIPS] PNX: Fix modpost warnings.
        [MIPS] Alchemy: Fix modpost warnings.
        [MIPS] Non-FPAFF: Fix warning.
        [MIPS] DEC: Fix modpost warning.
        [MIPS] MIPSsim: Enable MIPSsim virtual network driver.
        [MIPS] Delete Ocelot 3 support.
        [MIPS] remove LASAT Networks platforms support
        [MIPS] Early check for SMTC kernel on non-MT processor
        [MIPS] Add debugfs files to show fpuemu statistics
        [MIPS] Add some debugfs files to debug unaligned accesses
        [MIPS] rbtx4938: Fix secondary PCIC and glue internal NICs
        [MIPS] tc35815: Load MAC address via platform_device
        [MIPS] Move FPU affinity code into separate file.
        [MIPS] Make ioremap() work on TX39/49 special unmapped segment
        [MIPS] rbtx4938: Update and minimize defconfig
        ...
      0f166396
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/battery-2.6 · 5f60cfd9
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/battery-2.6:
        [BATTERY] ds2760 W1 slave
        [BATTERY] One Laptop Per Child power/battery driver
        [BATTERY] Apple PMU driver
        [BATTERY] 1-Wire ds2760 chip battery driver
        [BATTERY] APM emulation driver for class batteries
        [BATTERY] pda_power platform driver
        [BATTERY] Universal power supply class (was: battery class)
      5f60cfd9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 9f9d7632
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] vmlogrdr function annotation.
        [S390] s390: rename CPU_IDLE to S390_CPU_IDLE
        [S390] cio: Remove prototype for non-existing function cmf_reset().
        [S390] zcrypt: fix request timeout handling
        [S390] system call optimization.
        [S390] dasd: Avoid compile warnings on !CONFIG_DASD_PROFILE
        [S390] Remove volatile from atomic_t
        [S390] Program check in diag 210 under 31 bit
        [S390] Bogomips calculation for 64 bit.
        [S390] smp: Merge smp_count_cpus() and smp_get_save_areas().
        [S390] zcore: Fix __user annotation.
        [S390] fixed cdl-format detection.
        [S390] sclp: Test facility list before executing a service call.
        [S390] sclp: introduce some new interfaces.
        [S390] Fixed comment typo.
        [S390] vmcp cleanup
      9f9d7632
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 1b21f458
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (57 commits)
        [GFS2] Accept old format NFS filehandles
        [GFS2] Small fixes to logging code
        [DLM] dump more lock values
        [GFS2] Remove i_mode passing from NFS File Handle
        [GFS2] Obtaining no_formal_ino from directory entry
        [GFS2] git-gfs2-nmw-build-fix
        [GFS2] System won't suspend with GFS2 file system mounted
        [GFS2] remounting w/o acl option leaves acls enabled
        [GFS2] inode size inconsistency
        [DLM] Telnet to port 21064 can stop all lockspaces
        [GFS2] Fix gfs2_block_truncate_page err return
        [GFS2] Addendum to the journaled file/unmount patch
        [GFS2] Simplify multiple glock aquisition
        [GFS2] assertion failure after writing to journaled file, umount
        [GFS2] Use zero_user_page() in stuffed_readpage()
        [GFS2] Remove bogus '\0' in rgrp.c
        [GFS2] Journaled file write/unstuff bug
        [DLM] don't require FS flag on all nodes
        [GFS2] Fix deallocation issues
        [GFS2] return conflicts for GETLK
        ...
      1b21f458
    • Linus Torvalds's avatar
      Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block · 01370f06
      Linus Torvalds authored
      * 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block:
        pipe: add documentation and comments
        pipe: change the ->pin() operation to ->confirm()
        Remove remnants of sendfile()
        xip sendfile removal
        splice: completely document external interface with kerneldoc
        sendfile: remove bad_sendfile() from bad_file_ops
        shmem: convert to using splice instead of sendfile()
        relay: use splice_to_pipe() instead of open-coding the pipe loop
        pipe: allow passing around of ops private pointer
        splice: divorce the splice structure/function definitions from the pipe header
        splice: relay support
        sendfile: convert nfsd to splice_direct_to_actor()
        sendfile: convert nfs to using splice_read()
        loop: convert to using splice_direct_to_actor() instead of sendfile()
        splice: add void cookie to the actor data
        sendfile: kill generic_file_sendfile()
        sendfile: remove .sendfile from filesystems that use generic_file_sendfile()
        sys_sendfile: switch to using ->splice_read, if available
        vmsplice: add vmsplice-to-user support
        splice: abstract out actor data
      01370f06
    • Linus Torvalds's avatar
      Merge branch 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block · 5cbc39a7
      Linus Torvalds authored
      * 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block:
        Documentation/block/barrier.txt is not in sync with the actual code: - blk_queue_ordered() no longer has a gfp_mask parameter - blk_queue_ordered_locked() no longer exists - sd_prepare_flush() looks slightly different
        Use list_for_each_entry() instead of list_for_each() in the block device
        Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu",
        block/Kconfig already has its own "menuconfig" so remove these
        Use menuconfigs instead of menus, so the whole menu can be disabled at once
        cfq-iosched: fix async queue behaviour
        unexport bio_{,un}map_user
        Remove legacy CDROM drivers
        [PATCH] fix request->cmd == INT cases
        cciss: add new controller support for P700m
        [PATCH] Remove acsi.c
        [BLOCK] drop unnecessary bvec rewinding from flush_dry_bio_endio
        [PATCH] cdrom_sysctl_info fix
        blk_hw_contig_segment(): bad segment size checks
        [TRIVIAL PATCH] Kill blk_congestion_wait() stub for !CONFIG_BLOCK
      5cbc39a7
    • Adrian Bunk's avatar
      bonding/bond_main.c: make 2 functions static · 4ad072c9
      Adrian Bunk authored
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Cc: Chad Tindel <ctindel@users.sourceforge.net>
      Cc: Jay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4ad072c9
    • Masakazu Mokuno's avatar
      ps3: gigabit ethernet driver for PS3, take3 · 02c18891
      Masakazu Mokuno authored
      Hi,
      
      This is the third submission of the network driver for PS3.
      The differences from the previous one are:
      
        - renamed source file names so that their prefix can match
          with the module name
        - added cbe-oss-dev@ozlabs.org line for MAINTAINER file
        - changed some in copyright comments
      
      If there are no more comments, please apply for 2.6.23.
      
      Thank you
      
      --
      Subject: PS3: Ethernet driver
      
      From: Masakazu Mokuno <mokuno@sm.sony.co.jp>
      
      Add Gigabit Ethernet support for the PS3 game console.  The module will
      be called ps3_gelic.
      
      CC: Geoff Levand <geoffrey.levand@am.sony.com>
      Signed-off-by: default avatarMasakazu Mokuno <mokuno@sm.sony.co.jp>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      02c18891
    • Jeff Garzik's avatar
      [netdrvr] Fix dependencies for ax88796 ne2k clone driver · def47c50
      Jeff Garzik authored
      It needs writesb(), not available on all platforms.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      def47c50
    • Jan-Bernd Themann's avatar
      eHEA: Capability flag for DLPAR support · 4c3ca4da
      Jan-Bernd Themann authored
      This patch introduces a capability flag that is used by the DLPAR userspace
      tool to check which DLPAR features are supported by the eHEA driver.
      
      Missing goto has been included.
      Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4c3ca4da
    • Jeff Garzik's avatar
      Remove sk98lin ethernet driver. · e1abecc4
      Jeff Garzik authored
      Unmaintained, superceded by skge.
      
      Prodded to deletion by Adrian Bunk.  Acked by Stephen Hemminger.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      e1abecc4
    • Adrian Bunk's avatar
      sunhme.c:quattro_pci_find() must be __devinit · cd6f5b80
      Adrian Bunk authored
      This patch fixes the following section mismatch:
      
      <--  snip  -->
      
      ...
        MODPOST vmlinux
      WARNING: drivers/built-in.o(.text+0x272f8b): Section mismatch: reference to .init.text:quattro_pci_find (between 'happy_meal_pci_probe' and 'happy_meal_pci_remove')
      ...
      
      <--  snip  -->
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      cd6f5b80
    • Jay Vosburgh's avatar
      bonding / ipv6: no addrconf for slaves separately from master · c2edacf8
      Jay Vosburgh authored
      	At present, when a device is enslaved to bonding, if ipv6 is
      active then addrconf will be initated on the slave (because it is closed
      then opened during the enslavement processing).  This causes DAD and RS
      packets to be sent from the slave.  These packets in turn can confuse
      switches that perform ipv6 snooping, causing them to incorrectly update
      their forwarding tables (if, e.g., the slave being added is an inactve
      backup that won't be used right away) and direct traffic away from the
      active slave to a backup slave (where the incoming packets will be
      dropped).
      
      	This patch alters the behavior so that addrconf will only run on
      the master device itself.  I believe this is logically correct, as it
      prevents slaves from having an IPv6 identity independent from the
      master.  This is consistent with the IPv4 behavior for bonding.
      
      	This is accomplished by (a) having bonding set IFF_SLAVE sooner
      in the enslavement processing than currently occurs (before open, not
      after), and (b) having ipv6 addrconf ignore UP and CHANGE events on
      slave devices.
      
      	The eql driver also uses the IFF_SLAVE flag.  I inspected eql,
      and I believe this change is reasonable for its usage of IFF_SLAVE, but
      I did not test it.
      Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      c2edacf8
    • Alexey Dobriyan's avatar
      atl1: remove write-only var in tx handler · 89c0d26b
      Alexey Dobriyan authored
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@sw.ru>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      89c0d26b
    • Alexey Dobriyan's avatar
      macmace: use "unsigned long flags;" · 099575b6
      Alexey Dobriyan authored
      Code will do local_irq_save() on it.
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@sw.ru>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      099575b6
    • Peter Korsgaard's avatar
      Cleanup usbnet_probe() return value handling · 9514bfe5
      Peter Korsgaard authored
      usbnet_probe() handles a positive return value from the driver bind()
      function as success, but will later only setup the status handler if the
      return value was zero, leading to confusion. Patch adjusts this to accept
      positive values as success in both checks.
      Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      9514bfe5
    • Stephen Hemminger's avatar
      netxen: deinline and sparse fix · 4638aef1
      Stephen Hemminger authored
      Get rid of dubious casts to (void *) which causes a sparse warning.
      And move largeish function from inline to the one file that uses the code,
      the compiler can then decide to inline it.
      
      Compile tested only.
      Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      4638aef1
    • Francois Romieu's avatar
      eeprom_93cx6: shorten pulse timing to match spec (bis) · 8abd531e
      Francois Romieu authored
      Based on an original idea by John W. Linville.
      
      It is the missing part of 42d45ccd60636c28e35c2016f091783bc14ad99c
      Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      8abd531e
    • Olof Johansson's avatar
      phylib: Add Marvell 88E1112 phy id · 85cfb534
      Olof Johansson authored
      Add 88E1112 PHY ID to the marvell driver. Seems to do fine with the
      88E1111 inits.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      85cfb534
    • Olof Johansson's avatar
      phylib: cleanup marvell.c a bit · e5479239
      Olof Johansson authored
      Simplify the marvell driver init a bit: Make the supported devices an
      array instead of explicitly registering each structure. This makes it
      considerably easier to add new devices down the road.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      e5479239
    • Ben Dooks's avatar
      AX88796 network driver · 825a2ff1
      Ben Dooks authored
      Support for the Asix AX88796 network controller, an
      NE2000 compatible 10/100 ethernet device with internal
      PHY.
      
      The driver supports PHY settings via either ioctl() or
      the ethtool driver ops.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      825a2ff1
    • Robert P. J. Day's avatar
      [MIPS] PNX8550: Cleanup proc code. · 105b1bca
      Robert P. J. Day authored
      Here's a slightly cleaner way of creating the /proc structure for the
      pnx8850.  mostly, it creates a directory with default mode 555, since the
      one you're creating is mode 444, which is somewhat unusual for a directory
      under /proc.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      105b1bca
    • Ralf Baechle's avatar
      [MIPS] WRPPMC: Fix build. · 569fb753
      Ralf Baechle authored
      Using another systems defines is a safe way to get your code broken by
      accident when that system is removed.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      569fb753
    • Ralf Baechle's avatar
      [MIPS] Yosemite: Fix modpost warnings. · 44659f29
      Ralf Baechle authored
        MODPOST vmlinux
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x974): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x980): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x978): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x984): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x98c): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      WARNING: arch/mips/pmc-sierra/yosemite/built-in.o(.text+0x990): Section mismatch: reference to .init.data: (between 'prom_boot_secondary' and 'prom_cpus_done')
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      44659f29
    • Atsushi Nemoto's avatar
      [MIPS] Change names of local variables to silence sparse · 7e95a016
      Atsushi Nemoto authored
      This patch is an workaround for these sparse warnings:
      
      linux/include/linux/calc64.h:25:17: warning: symbol '__quot' shadows an earlier one
      linux/include/linux/calc64.h:25:17: originally declared here
      linux/include/linux/calc64.h:25:17: warning: symbol '__mod' shadows an earlier one
      linux/include/linux/calc64.h:25:17: originally declared here
      Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      7e95a016
    • Ralf Baechle's avatar
      [MIPS] SB1: Fix modpost warning. · 62b39635
      Ralf Baechle authored
        MODPOST vmlinux
      WARNING: arch/mips/mm/built-in.o(.text+0x1978): Section mismatch: reference to .init.text:except_vec2_sb1 (between 'sb1_cache_init' and 'sb1_flush_cache_sigtramp')
      WARNING: arch/mips/mm/built-in.o(.text+0x1988): Section mismatch: reference to .init.text:except_vec2_sb1 (between 'sb1_cache_init' and 'sb1_flush_cache_sigtramp')
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      62b39635
    • Ralf Baechle's avatar
      [MIPS] PNX: Fix modpost warnings. · f2c4b47f
      Ralf Baechle authored
        MODPOST vmlinux
      WARNING: arch/mips/philips/pnx8550/common/built-in.o(.text+0xd40): Section mismatch: reference to .init.data: (after 'pnx8550_platform_init')
      WARNING: arch/mips/philips/pnx8550/common/built-in.o(.text+0xd44): Section mismatch: reference to .init.data: (after 'pnx8550_platform_init')
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f2c4b47f