1. 17 7月, 2007 18 次提交
  2. 11 7月, 2007 22 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 4c75f741
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6ed911fb
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 64b853aa
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 0f166396
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.infradead.org/~dwmw2/battery-2.6 · 5f60cfd9
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 9f9d7632
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 1b21f458
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block · 01370f06
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block · 5cbc39a7
      Linus Torvalds 提交于
      * '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
    • A
      bonding/bond_main.c: make 2 functions static · 4ad072c9
      Adrian Bunk 提交于
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Cc: Chad Tindel <ctindel@users.sourceforge.net>
      Cc: Jay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      4ad072c9
    • J
      [PATCH] softmac: Fix ESSID problem · 4cf92a3c
      Jean Tourrilhes 提交于
      Victor Porton reported that the SoftMAC layer had random problem when setting the ESSID :
      http://bugzilla.kernel.org/show_bug.cgi?id=8686 After investigation, it turned out to be
      worse, the SoftMAC layer is left in an inconsistent state. The fix is pretty trivial.
      Signed-off-by: NJean Tourrilhes <jt@hpl.hp.com>
      Acked-by: NMichael Buesch <mb@bu3sch.df>
      Acked-by: NLarry Finger <Larry.Finger@lwfinger.net>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      4cf92a3c
    • M
      [PATCH] use list_for_each_entry() for iteration in Prism 54 driver · 426921bd
      Matthias Kaehlcke 提交于
      Use list_for_each_entry() instead of manual iteration and substitute a
      list_for_each_safe() loop with list_for_each_entry_safe()
      Signed-off-by: NMatthias Kaehlcke <matthias.kaehlcke@gmail.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Acked-by: NLuis R. Rodriguez <mcgrof@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      426921bd
    • D
      [PATCH] libertas: fix disabling WPA · 777fa981
      Dan Williams 提交于
      Found by Guillaume LECERF <glecerf@gmail.com>
      Signed-off-by: NDan Williams <dcbw@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      777fa981
    • A
      [PATCH] drivers/net/wireless/libertas/wext.c: remove dead code · 6b62472a
      Adrian Bunk 提交于
      This patch removes dead code introduced by
      commit 90a42210 and spotted
      by the Coverity checker.
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      6b62472a
    • D
      [PATCH] zd1211rw: Defer firmware load until first ifup · 74553aed
      Daniel Drake 提交于
      While playing with the firmware a while back, I discovered a way to
      access the device's entire address space before the firmware has been
      loaded.
      
      Previously we were loading the firmware early on (during probe) so that
      we could read the MAC address from the EEPROM and register a netdevice.
      Now that we can read the EEPROM without having firmware, we can defer
      firmware loading until later while still reading the MAC address early
      on.
      
      This has the advantage that zd1211rw can now be built into the kernel --
      previously if this was the case, zd1211rw would be loaded before the
      filesystem is available and firmware loading would fail.
      
      Firmware load and other device initialization operations now happen the
      first time the interface is brought up.
      
      Some architectural changes were needed: handling of the is_zd1211b flag
      was moved into the zd_usb structure, MAC address handling was obviously
      changed, and a preinit_hw stage was added (the order is now: init,
      preinit_hw, init_hw).
      Signed-off-by: NDaniel Drake <dsd@gentoo.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      74553aed
    • D
      [PATCH] zd1211rw: Add ID for Buffalo WLI-U2-KG54L · 93f510bb
      Daniel Drake 提交于
      Tested by Zen Kato
      zd1211b chip 0411:00da v4810 high 00-16-01 AL2230S_RF pa0 g--N-
      Signed-off-by: NDaniel Drake <dsd@gentoo.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      93f510bb
    • D
      [PATCH] zd1211rw: Detect more AL2230S radios · 4418583c
      Daniel Drake 提交于
      Zen Kato has a device which reports the 0xa RF type. The vendor driver
      treats this as AL2230S, the same as devices with the AL2230S bit in the POD.
      Signed-off-by: NDaniel Drake <dsd@gentoo.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      4418583c
    • D
      [PATCH] zd1211rw: Allow channels 1-11 for unrecognised regulatory domains · 86d95c21
      Daniel Drake 提交于
      Zen Kato's device has a regulatory domain value of 0x49, which is not an
      IEEE 802.11 code and is not even identified in the vendor driver.
      
      Recent versions of the vendor driver don't even look at the regdomain
      value any more, and just allow channels 1-11 everywhere. This patch
      brings us more in line with that behaviour, by allowing channels 1-11
      for regdomains which we don't know about.
      Signed-off-by: NDaniel Drake <dsd@gentoo.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      86d95c21
    • M
      ps3: gigabit ethernet driver for PS3, take3 · 02c18891
      Masakazu Mokuno 提交于
      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: NMasakazu Mokuno <mokuno@sm.sony.co.jp>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      02c18891
    • M
      [PATCH] airo: start with radio off · fb038c27
      Michal Schmidt 提交于
      Don't turn the radio on until the interface is up. This saves some power in
      case the driver is loaded but the card is not used.
      Signed-off-by: NMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      fb038c27
    • M
      [PATCH] airo: simpler calling convention for enable_MAC() · 175ec1a1
      Michal Schmidt 提交于
      Callers of enable_MAC() shouldn't have to worry about the bits in the
      response's status word (and most of them don't). The return value is
      sufficient information.
      Signed-off-by: NMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      175ec1a1
    • M
      [PATCH] airo: fix a race causing initialization failures · 1138c37b
      Michal Schmidt 提交于
      Matteo Croce reported Aironet initialization failures. They were caused by
      a race in airo. airo finds a free interface name, then initializes the card
      and finally registers the interface. Another device may get the same name
      in the meantime.
      The reason airo gets its name early is to use it in informative printks and
      to name the resources it requests. The printks will be just fine without
      the interface name and the resources can use the driver's name - that's
      what other network drivers do anyway.
      One of the talkative functions is setup_card(). It is called once before
      registration and can be called later again. Let's have an empty dev->name
      during the first call, so it doesn't print the ugly "airo(eth%d)" message.
      Signed-off-by: NMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      1138c37b