Permalink
Commits on Mar 7, 2007
  1. Linux 2.6.21-rc3

    .. hopefully most of the resume/suspend problems introduced by the timer
    and other changes are behind us.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Linus Torvalds committed Mar 7, 2007
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC64]: Fix floppy build failure.
    Linus Torvalds committed Mar 7, 2007
  3. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [DCCP]: Set RTO for newly created child socket
      [DCCP]: Correctly split CCID half connections
      [NET]: Fix compat_sock_common_getsockopt typo.
      [NET]: Revert incorrect accept queue backlog changes.
      [INET]: twcal_jiffie should be unsigned long, not int
      [GIANFAR]: Fix compile error in latest git
      [PPPOE]: Use ifindex instead of device pointer in key lookups.
      [NETFILTER]: ip6_route_me_harder should take into account mark
      [NETFILTER]: nfnetlink_log: fix reference counting
      [NETFILTER]: nfnetlink_log: fix module reference counting
      [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
      [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
      [NETFILTER]: nfnetlink_log: fix use after free
      [NETFILTER]: nfnetlink_log: fix reference leak
      [NETFILTER]: tcp conntrack: accept SYN|URG as valid
      [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
      [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
    Linus Torvalds committed Mar 7, 2007
  4. Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linu…

    …x-2.6
    
    * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
      [S390] cio: Call cancel_halt_clear even when actl == 0.
      [S390] cio: Use path verification to check for path state.
      [S390] cio: Fix locking when calling notify function.
      [S390] Fixed handling of access register mode faults.
      [S390] dasd: Use default recovery for SNSS requests
      [S390] check_bugs() should be inline.
      [S390] tape: Compression overwrites crypto setting
      [S390] nss: disable kexec.
      [S390] reipl: move dump_prefix_page out of text section.
      [S390] smp: disable preemption in smp_call_function/smp_call_function_on
      [S390] kprobes breaks BUG_ON
    Linus Torvalds committed Mar 7, 2007
  5. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_pdc202xx_old: fix data corruption and other problems
      pata_legacy: fix io/irq mismatch
      ahci: RAID mode SATA patch for Intel ICH9M
    Linus Torvalds committed Mar 7, 2007
  6. Revert "[PATCH] LOG2: Alter get_order() so that it can make use of il…

    …og2() on a constant"
    
    This reverts commit 39d61db.
    
    The commit was buggy in multiple ways:
     - the conversion to ilog2() was incorrect to begin with
     - it tested the wrong #defines, so on all architectures but FRV you'd
       never see the bug except for constant arguments.
     - the new "get_order()" macro used its arguments multiple times, and
       didn't even parenthesize them properly
     - despite the comments, it was not true that you could use it for
       constant initializers, since not all architectures even use the
       generic page.h header file.
    
    All of the problems are individually fixable, but it all boils down to:
    better just revert it, and re-do it from scratch.
    
    Cc: David Howells <dhowells@redhat.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Linus Torvalds committed Mar 7, 2007
  7. [PATCH] m68knommu: remove local_bh_count

    Remove un-used/un-referenced local_bh_count.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  8. [PATCH] m68knommu: use irq_handler_t and rtc_time in prototypes

    Use irq_handler_t for passing clock handler routine around.
    And use new rtc_time in place of hwclock_time.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  9. [PATCH] m68knommu: GPIO line defines for the ColdFire 5282

    For the Freescale M5282 ColdFire,
    Port UA Pin Assignment Register should set to UART mode.
    Patch submitted by David Wu <davidwu@arcturusnetworks.com>.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  10. [PATCH] m68knommu: fix work queues in mcfserial.c driver

    Fix work queue code to support new model.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  11. [PATCH] m68knommu: set GPIO lines for serial ports on 5282 in mcfseri…

    …al.c
    
    For the Freescale M5282 ColdFire,
    Port UA Pin Assignment Register should set to UART mode.
    Patch submitted by David Wu <davidwu@arcturusnetworks.com>.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  12. [PATCH] m68knommu: use irq_handler_t and remove regs arg for 68328

    Remove regs arg from bad interrupt handler.
    Use irq_handler_t type for handler arg of local request_irq().
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  13. [PATCH] m68knommu: use irq_handler_t for passing handler types in 683…

    …28 setup
    
    Use irq_handler_t type for passing around timer interrupt routine
    in 368360 setup code.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  14. [PATCH] m68knommu: use irq_handler_t for passing handler types in 683…

    …60 setup
    
    Use irq_handler_t type for passing around timer interrupt routine.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with Linus Torvalds Mar 7, 2007
  15. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] kexec: Use EFI_LOADER_DATA for ELF core header
      [IA64] permon use-after-free fix
      [IA64] sync compat getdents
      [IA64] always build arch/ia64/lib/xor.o
      [IA64] Remove stack hard limit on ia64
      [IA64] point saved_max_pfn to the max_pfn of the entire system
      Revert "[IA64] swiotlb abstraction (e.g. for Xen)"
    Linus Torvalds committed Mar 7, 2007
  16. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] IP27: Build fix
      [MIPS] Wire up ioprio_set and ioprio_get.
      [MIPS] Fix __raw_read_trylock() to allow multiple readers
      [MIPS] Export __copy_user_inatomic.
      [MIPS] R2 bitops compile fix for gcc < 4.0.
      [MIPS] TX39: Remove redundant tx39_blast_icache() calls
      [MIPS] Cobalt: Fix early printk
      [MIPS] SMTC: De-obscure Malta hooks.
      [MIPS] SMTC: Add fordward declarations for mm_struct and task_struct.
      [MIPS] SMTC: <asm/mips_mt.h> must include <linux/cpumask.h>
      [MIPS] SMTC: <asm/smtc_ipi.h> must include <linux/spinlock.h>
      [MIPS] Atlas, Malta: Fix build warning.
    Linus Torvalds committed Mar 7, 2007
  17. [PATCH] minor updat to tlclk Kconfig entry

    The tlclk driver is going on the MPCBL005 so I need to make the Kconfig
    more more generic.  Just some text changes.
    
    Signed-off-by: Mark Gross <mark.gross@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Mark Gross committed with Linus Torvalds Mar 6, 2007
  18. @holtmann

    [PATCH] Fix buffer overflow in Omnikey CardMan 4040 driver (CVE-2007-…

    …0005)
    
    Based on a patch from Don Howard <dhoward@redhat.com>
    
    When calling write() with a buffer larger than 512 bytes, the
    driver's write buffer overflows, allowing to overwrite the EIP and
    execute arbitrary code with kernel privileges.
    
    In read(), there exists a similar problem, but coming from the device.
    A malicous or buggy device sending more than 512 bytes can overflow
    of the driver's read buffer, with the same effects as above.
    
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Harald Welte <laforge@gnumonks.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    holtmann committed with Linus Torvalds Mar 6, 2007
  19. [PATCH] suspend regression: sysfs deadlock

    Suspend deadlocks when trying to unregister /sys/block/sr0.
    
    This comes from Oliver's commit 94bebf4
    "Driver core: fix race in sysfs between sysfs_remove_file() and
    read()/write()".
    
    sysfs_write_file downs buffer->sem while calling flush_write_buffer, and
    flushing that particular write buffer entails downing buffer->sem in
    orphan_all_buffers, resulting in the obvious self-deadlock.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Hugh Dickins committed with Linus Torvalds Mar 6, 2007
  20. Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…

    …it/jikos/hid
    
    * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
      HID blacklisting of all Code Mercenaries IOWarrior devices
    Linus Torvalds committed Mar 7, 2007
  21. Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/p…

    …erex/alsa
    
    * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
      [ALSA] version 1.0.14rc3
      [ALSA] cmipci - Allow to disable integrated FM port
      [ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
      [ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
      [ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
      [ALSA] Add missing sysfs device assignment for ALSA PCI drivers
      [ALSA] hda-codec - Define pin configs for MacBooks
      [ALSA] hda-codec - Add missing Mic Boost controls for ALC262
      [ALSA] soc - WM9712 PCM volume
      [ALSA] soc - Fix WM9712 register cache entry
      [ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
      [ALSA] hda-codec - Add LFE support on Dell M90
    Linus Torvalds committed Mar 7, 2007
  22. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] cifs_prepare_write was incorrectly rereading page in some cases
      [CIFS] Fix set file size to zero when doing chmod to Samba 3.0.26pre
      [CIFS] Remove some unused functions/declarations
      [CIFS] New file for previous commit
      [CIFS] cifs export operations
      [CIFS] small piece missing from previous patch
      [CIFS] Fix locking problem around some cifs uses of i_size write
    Linus Torvalds committed Mar 7, 2007
  23. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/drzeus/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
      sdhci: release irq during suspend
      sdhci: make isr tolerant of read errors
      mmc: require explicit support for high-speed
      ncpfs: make sure server connection survives a kill
    Linus Torvalds committed Mar 7, 2007
  24. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      sis900 warning fixes
      mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data
      pcnet32: Fix PCnet32 performance bug on non-coherent architecutres
      __devinit & __devexit cleanups for de2104x driver
      3c59x: Handle pci_enable_device() failure while resuming
      dmfe: Fix link detection
      dmfe: fix two bugs
      dmfe: trivial/spelling fixes
      revert "drivers/net/tulip/dmfe: support basic carrier detection"
      ucc_geth: returns NETDEV_TX_BUSY when BD ring is full
      ucc_geth: Fix BD processing
      natsemi: netpoll fixes
      bonding: Improve IGMP join processing
      bonding: only receive ARPs for us
      bonding: fix double dev_add_pack
    Linus Torvalds committed Mar 7, 2007
  25. @ralfbaechle

    [MIPS] IP27: Build fix

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 6, 2007
  26. @ralfbaechle

    [MIPS] Wire up ioprio_set and ioprio_get.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 6, 2007
  27. @ralfbaechle

    [MIPS] Fix __raw_read_trylock() to allow multiple readers

    A deadlock can occur for mixed irq and non-irq rwlock readers if a 2nd
    reader attempts to take lock by looping around __raw_read_trylock().
    
    Signed-off-by: Dave Johnson <djohnson+linux-mips@sw.starentnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Dave Johnson committed with ralfbaechle Mar 6, 2007
  28. @ralfbaechle

    [MIPS] Export __copy_user_inatomic.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 5, 2007
  29. @ralfbaechle

    [MIPS] R2 bitops compile fix for gcc < 4.0.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 5, 2007
  30. @ralfbaechle

    [MIPS] TX39: Remove redundant tx39_blast_icache() calls

    Apply commit 0550d9d to c-tx39.c too.
    And fix a warning in local_tx39_flush_data_cache_page().
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Atsushi Nemoto committed with ralfbaechle Mar 4, 2007
  31. @ralfbaechle

    [MIPS] Cobalt: Fix early printk

    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa committed with ralfbaechle Mar 2, 2007
  32. @ralfbaechle

    [MIPS] SMTC: De-obscure Malta hooks.

    Should now be understandable why the thing works ...
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 4, 2007
  33. @ralfbaechle

    [MIPS] SMTC: Add fordward declarations for mm_struct and task_struct.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 4, 2007
  34. @ralfbaechle

    [MIPS] SMTC: <asm/mips_mt.h> must include <linux/cpumask.h>

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 4, 2007
  35. @ralfbaechle

    [MIPS] SMTC: <asm/smtc_ipi.h> must include <linux/spinlock.h>

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Mar 4, 2007