Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 19, 2007
  1. Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/lin…

    Nigel Cunningham authored
    …ux-2.6.git
  2. [Suspend2] Change the version number to 2.2.10.

    Nigel Cunningham authored
    Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
Commits on May 18, 2007
  1. [Suspend2] Rename userui_redraw to userui_post_atomic_restore.

    Nigel Cunningham authored
    This better reflects its purpose, and fits better with the expanded
    response to receiving this message that I just committed on the userui
    side.
    
    Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
  2. @davidel

    timerfd use waitqueue lock ...

    davidel authored Linus Torvalds committed
    The timerfd was using the unlocked waitqueue operations, but it was
    using a different lock, so poll_wait() would race with it.
    
    This makes timerfd directly use the waitqueue lock.
    
    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @davidel

    eventfd use waitqueue lock ...

    davidel authored Linus Torvalds committed
    The eventfd was using the unlocked waitqueue operations, but it was
    using a different lock, so poll_wait() would race with it.
    
    This makes eventfd directly use the waitqueue lock.
    
    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/lin…

    Nigel Cunningham authored
    …ux-2.6.git
  5. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    Linus Torvalds authored
    …t/paulus/powerpc
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
      [POWERPC] Remove build warnings in windfarm_core
      [POWERPC] Pass per-file CFLAGs for platform specific op codes
      [POWERPC] Correct #endif comment
      [POWERPC] Fix ppc_rtas_progress_show()
      [POWERPC] Fix sed command lines for zlib source construction
      [POWERPC] Specify GNUTARGET on $(AR) invocations
      [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
      [POWERPC] Small fixes for the Ebony device tree
      [POWERPC] Fix warning on UP
      [POWERPC] cell_defconfig: Disable cpufreq and pmi
      [POWERPC] Fix IO space on PCI buses created from of_platform
      [POWERPC] Add spinlock to request_phb_iospace()
      [POWERPC] Fix make rules for treeImage.initrd
      [POWERPC] Remove warning in mpic.c
      [POWERPC] Update pasemi_defconfig
      [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
      [POWERPC] Update iseries_defconfig
      [POWERPC] Wire up some more syscalls
      [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
      [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
      ...
  6. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC64]: Fix sched_clock() et al.
  7. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [IPV4]: Remove IPVS icmp hack from route.c for now.
      [IPV4]: Correct rp_filter help text.
      [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS
      [TCP] slow start: Make comments and code logic clearer.
      [BLUETOOTH]: Fix locking in hci_sock_dev_event().
      [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
      [NET]: lockdep classes in register_netdevice
  8. slub: another slabinfo fix

    Christoph Lameter authored Linus Torvalds committed
    The slab manipulation functions should not be triggered by slabs that
    are unresovable in the subset of slabs selected on the command line.
    
    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. revert "cancel_delayed_work: use del_timer() instead of del_timer_syn…

    Oleg Nesterov authored Linus Torvalds committed
    …c()"
    
    As pointed out by Jarek Poplawski, the patch
    
    	[WORKQUEUE]: cancel_delayed_work: use del_timer() instead of del_timer_sync()
    	commit: 071b638
    
    was wrong, it was merged by mistake after that.
    
    From the changelog:
    
    	after this patch:
    		...
    		delayed_work_timer_fn->__queue_work() in progress.
    
    		The latter doesn't differ from the caller's POV,
    
    it does make a difference if the caller calls flush_workqueue() after
    cancel_delayed_work(), in that case flush_workqueue() can miss this
    work_struct.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Jarek Poplawski <jarkao2@o2.pl>
    Cc: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. [IPV4]: Remove IPVS icmp hack from route.c for now.

    David S. Miller authored
    Revert: 2d771cd
    
    This is dangerous if enabled and a better solution to the
    problem is being worked on.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. [SPARC64]: Fix sched_clock() et al.

    David S. Miller authored
    SPARC64_NSEC_PER_CYC_SHIFT was set too high.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/lin…

    Nigel Cunningham authored
    …ux-2.6.git
  13. Fix typo in console_printk compile error fix.

    Nigel Cunningham authored
    Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
  14. Shorten error message given on failure to suspend devices.

    Nigel Cunningham authored
    Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
  15. Revert "[PATCH] x86: Drop cc-options call for all options supported i…

    Linus Torvalds authored
    …n gcc 3.2+"
    
    This reverts commit c8fdd24.
    
    It turns out the kernel was correct, and the gcc complaint was a gcc
    bug.  The preferred stack boundary is expressed not in bytes, but in the
    the log2() of the preferred boundary, so "-mpreferred-stack-boundary=2"
    is in fact exactly what we want, but a gcc that is compiled for x86-64
    will consider it an error (because the 64-bit calling sequence says that
    the stack should be 16-byte aligned) even if we are then using "-m32" to
    generate 32-bit code.
    
    Noted-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
    Cc: Jan Hubicka <jh@suse.cz>
    Acked-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. Fix breakage in free_pbe_list.

    Nigel Cunningham authored
    Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
  17. Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

    Linus Torvalds authored
    * git://git.linux-nfs.org/pub/linux/nfs-2.6:
      SUNRPC: Fix sparse warnings
      NLM: Fix sparse warnings
      NFS: Fix more sparse warnings
      NFS: Fix some 'sparse' warnings...
      SUNRPC: remove dead variable 'rpciod_running'
      NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.c
      NFS: use zero_user_page
      NLM: don't use CLONE_SIGHAND in nlmclnt_recovery
      NLM: Fix locking client timeouts...
  18. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_via: pcim_iomap_regions() conversion missed BAR5
      libata: remove libata.spindown_compat
      sata_nv: fix fallout of devres conversion
      drivers/ata: remove the wildcard from sata_nv driver
  19. @htejun

    sata_via: pcim_iomap_regions() conversion missed BAR5

    htejun authored Jeff Garzik committed
    pcim_iomap_regions() conversion missed BAR5.  Fix it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  20. @htejun

    libata: remove libata.spindown_compat

    htejun authored Jeff Garzik committed
    With STANDBYDOWN tracking added, libata.spindown_compat isn't
    necessary anymore.  If userspace shutdown(8) issues STANDBYNOW, libata
    warns.  If userspace shutdown(8) doesn't issue STANDBYNOW, libata does
    the right thing.  Userspace can tell whether kernel supports spindown
    by testing whether sysfs node manage_start_stop exists as before.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  21. @htejun

    sata_nv: fix fallout of devres conversion

    htejun authored Jeff Garzik committed
    As with all other drivers, sata_nv's hpriv is allocated with
    devm_kzalloc() and there's no need to free it explicitly.  Kill
    nv_remove_one() which incorrectly used kfree() instead of devm_kfree()
    and use ata_pci_remove_one() directly.
    
    Original fix is from Peer Chen.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Peer Chen <pchen@nvidia.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  22. drivers/ata: remove the wildcard from sata_nv driver

    Peer Chen authored Jeff Garzik committed
    Because nvidia SATA controllers onward base on AHCI, so wildcard in sata_nv
    driver is unnecessary.  Also the wildcard sometimes cause sata_nv driver to
    be loaded for AHCI controllers,which is not as expected.
    
    Signed-off-by: Peer Chen <pchen@nvidia.com>
    Cc: Tejun Heo <htejun@gmail.com>
    Cc: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  23. @sofar

    e1000: Fix msi enable leak on error, don't print error message, cleanup

    sofar authored Jeff Garzik committed
    pci_enable_msi failure is a normal event so we should not print any error.
    Going over the code I spotted a missing pci_disable_msi() leak when irq
    allocation fails. The whole code also needed a cleanup, so I combined the
    two different calls to pci_request_irq into a single call making this
    look a lot better. All #ifdef CONFIG_PCI_MSI's have been removed.
    
    Compile tested with both CONFIG_PCI_MSI enabled and disabled.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  24. @sofar

    ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak

    sofar authored Jeff Garzik committed
    pci_enable_msi calls can fail for normal operational reasons. Driver
    should not print an error message in that case. Fix a leak that leaves
    msi enabled if pci_request_irq fails. We can remove CONFIG_PCI_MSI
    ifdefs alltogether
    
    Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  25. NetXen: Fix NetXen driver ping on system-p

    Mithlesh Thukral authored Jeff Garzik committed
    NetXen: Fix for driver on System-p
    This patch will fix a ping issue on system-p
    
    Signed-off by: Milan Bag <mbag@netxen.com>
    Signed-off by: Adhiraj Joshi <adhiraj@netxen.com>
    Signed-by: Mithlesh Thukral <mithlesh@netxen.com>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  26. spidernet: node-aware skbuff allocation

    Christoph Hellwig authored Jeff Garzik committed
    Spidernet was the driver I original did all the node-aware netdevice
    allocation for, but after a year it still hasn't hit mainline.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  27. gianfar: Add I/O barriers when touching buffer descriptor ownership.

    Scott Wood authored Jeff Garzik committed
    The hardware must not see that is given ownership of a buffer until it is
    completely written, and when the driver receives ownership of a buffer,
    it must ensure that any other reads to the buffer reflect its final
    state.  Thus, I/O barriers are added where required.
    
    Without this patch, I have observed GCC reordering the setting of
    bdp->length and bdp->status in gfar_new_skb.  Hardware reordering
    was also theoretically possible.
    
    Signed-off-by: Scott Wood <scottwood@freescale.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  28. ibm_emac: fix link speed detection change

    Eugene Surovegin authored Jeff Garzik committed
    Fix link speed detection change.
    Thanks to Stefan Roese <sr@denx.de> for finding this bug.
    
    CC: Stefan Roese <sr@denx.de>
    Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  29. ibm_emac: improved PHY support

    Eugene Surovegin authored Jeff Garzik committed
    Original patch is from Jeff Haran  <jharan@brocade.com> with my minor style
    fixes. His comments follow:
    
    The first problem was in the function that configures the PHY for
    autonegotiation, genmii_setup_aneg(). The original code does a
    read/modify/write of the autonegotiation advertizement register (reg 4),
    followed by a read/modify/write of the control register (reg 0). While
    the original code follows the proper procedure as per reading the IEEE
    specs, what I found is that on at least one PHY model (National DP83843)
    the read of the control register comes back with the soft reset bit set
    (bit 15). Because of the read/modify/write operation, this causes the
    write to write a 1 back to the reset bit, which initiates a software
    reset of the PHY. This software reset causes the PHY to return to its
    power up state which advertizes all modes of operation, thus negating
    the write to the autoneg advertizement register. The modification is to
    spin reading the control register until the soft reset bit is clear
    before doing the modify/write.
    The second problem was in the function that configures the PHY for
    forced operation, genmii_setup_forced(). The original code initiates a
    software reset operation via a write of a 1 to bit 15 of the control
    register (reg 0), but then proceeds to do a second write to that same
    register without waiting until that reset bit is cleared by the PHY
    itself (which according to the IEEE specs indicates that the PHY reset
    is complete). This is a violation of how one is supposed to use this
    software reset feature of these PHYs and I believe was the cause of
    mysterious, difficult to reproduce link failures that we've observed on
    some of our systems that use this driver. The fix is to modify the
    function so that it spins waiting for the reset bit to clear after doing
    the soft reset and before doing the subsequent write.
    
    Signed-off-by: Jeff Haran <jharan@brocade.com>
    CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  30. ibm_emac: fix section mismatch warnings

    Eugene Surovegin authored Jeff Garzik committed
    Fix "Section mismatch" warnings
    
    Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  31. small netdevices.txt fix

    Christoph Hellwig authored Jeff Garzik committed
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  32. sky2: memory barriers change

    Stephen Hemminger authored Jeff Garzik committed
    Do some memory barrier changes for safety/perfomance:
    Don't need read after update to index, mmiowb() followed by read at end
    of irq is sufficient.
    
    Signed-off-by: Stephn Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  33. sky2: remove dual port workaround

    Stephen Hemminger authored Jeff Garzik committed
    This workaround was added to deal with NAPI core and how
    it affected dual port shared polling. It turned out not to
    be necessary. Stopping device 0 only doesn't stop NAPI from
    working completely after that.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
Something went wrong with that request. Please try again.