1. 13 8月, 2008 4 次提交
  2. 12 8月, 2008 8 次提交
    • L
      Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd · 10fec20e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.o-hand.com/linux-mfd:
        mfd: tc6393 cleanup and update
        mfd: have TMIO drivers and subdevices depend on ARM
        mfd: TMIO MMC driver
        mfd: driver for the TMIO NAND controller
        mfd: t7l66 MMC platform data
        mfd: tc6387 MMC platform data
        mfd: Fix 7l66 and 6387 according to the new mfd-core API
        mfd: Fix tc6393 according to the new tmio.h
        mfd: driver for the TC6387XB TMIO controller.
        mfd: driver for the T7L66XB TMIO SoC
        mfd: TMIO MMC structures and accessors.
      10fec20e
    • L
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 29bb1bdb
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon: (lm75) Drop legacy i2c driver
        i2c: correct some size_t printk formats
        i2c: Check for address business before creating clients
        i2c: Let users select algorithm drivers manually again
        i2c: Fix NULL pointer dereference in i2c_new_probed_device
        i2c: Fix oops on bus multiplexer driver loading
      29bb1bdb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 3f1ae223
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] pcwd.c - fix open_allowed type.
        [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
        [WATCHDOG] fix watchdog/wdt285.c compilation
        [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
        [WATCHDOG] fix watchdog/shwdt.c compilation
        [WATCHDOG] fix watchdog/txx9wdt.c compilation
        [WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
        [WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
      3f1ae223
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · e2205a15
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        powerpc: Remove include/linux/harrier_defs.h
        powerpc: Do not ignore arch/powerpc/include
        powerpc: Delete completed "ppc removal" task from feature removal file
        powerpc/mm: Fix attribute confusion with htab_bolt_mapping()
        powerpc/pci: Don't keep ISA memory hole resources in the tree
        powerpc: Zero fill the return values of rtas argument buffer
        powerpc/4xx: Update defconfig files for 2.6.27-rc1
        powerpc/44x: Incorrect NOR offset in Warp DTS
        powerpc/44x: Warp DTS changes for board updates
        powerpc/4xx: Cleanup Warp for i2c driver changes.
        powerpc/44x: Adjust warp-nand resource end address
      e2205a15
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · a7ef6a40
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: Limit VPD length for Broadcom 5708S
        PCI PM: Export pci_pme_active to drivers
        PCI: remove duplicate symbol from pci_ids.h
        PCI: check the return value of device_create_bin_file() in pci_create_bus()
        PCI: fully restore MSI state at resume time
        DMA: make dma-coherent.c documentation kdoc-friendly
        PCI: make pci_register_driver() a macro
        PCI: add Broadcom 5708S to VPD length quirk
      a7ef6a40
    • C
      Fix race/oops in tty layer after BKL pushdown · 000b9151
      Christian Borntraeger 提交于
      While testing our KVM code for s390 (starting and killall kvm in a loop)
      I can reproduce the following oops:
      
        Unable to handle kernel pointer dereference at virtual kernel address 6b6b6b6b6b6b6000 Oops: 0038 [#1] SMP
        Modules linked in: dm_multipath sunrpc qeth_l3 qeth_l2 dm_mod qeth
        ccwgroup CPU: 1 Not tainted 2.6.27-rc1 #54
        Process kuli (pid: 4409, task: 00000000b6aa5940, ksp: 00000000b7343e10)
        Krnl PSW : 0704e00180000000 00000000002e0b8c
        (disassociate_ctty+0x1c0/0x288) R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3
        CC:2 PM:0 EA:3 Krnl GPRS: 0000000000000000 6b6b6b6b6b6b6b6b
        0000000000000001 00000000000003a6 00000000002e0a46 00000000004b4160
        0000000000000001 00000000bbd79758 00000000b7343e58 00000000b8854148
        00000000bd34dea0 00000000b7343c20 0000000000000001 00000000004b6d08
        00000000002e0a46 00000000b7343c20 Krnl Code: 00000000002e0b7e:
        eb9fb0a00004	lmg	%r9,%r15,160(%r11) 00000000002e0b84:
        07f4		bcr	15,%r4 00000000002e0b86:
        e31090080004	lg	%r1,8(%r9) >00000000002e0b8c:
        d501109cd000	clc	156(2,%r1),0(%r13) 00000000002e0b92:
        a784ff5d		brc	8,2e0a4c 00000000002e0b96:
        b9040029		lgr	%r2,%r9 00000000002e0b9a:
        c0e5fffff9c3	brasl	%r14,2dff20 00000000002e0ba0:
        a7f4ff56		brc	15,2e0a4c Call Trace:
        ([<00000000002e0a46>] disassociate_ctty+0x7a/0x288)
         [<0000000000141fe6>] do_exit+0x212/0x8d4
         [<0000000000142708>] do_group_exit+0x60/0xcc
         [<0000000000150660>] get_signal_to_deliver+0x270/0x3ac
         [<000000000010bfd6>] do_signal+0x8e/0x8dc
         [<0000000000113772>] sysc_sigpending+0xe/0x22
         [<000001ff0000b134>] 0x1ff0000b134
        INFO: lockdep is turned off.
        Last Breaking-Event-Address:
         [<00000000002e0a48>] disassociate_ctty+0x7c/0x288
        Kernel panic - not syncing: Fatal exception: panic_on_oops
      
      It seems that tty was already free in disassocate_ctty when it tries
      to dereference tty->driver.
      
      After moving the lock_kernel before the mutex_unlock, I can no longer
      reproduce the problem.
      
      [ This is a temporary partial fix for the documented and long standing
        race in disassociate_tty.  This stops most problem cases for now.
      
        For the next release the -next tree has an initial implementation of
        kref counting for tty structures and this quickfix will be dropped.
      
                                                                    - Alan ]
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by; Alan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      000b9151
    • G
      m68k{,nommu}: Wire up new system calls · 0e7d5bb8
      Geert Uytterhoeven 提交于
      Wire up for m68k{,nommu} the system calls that were added in the last merge
      window:
      
       - 4006553b ("flag parameters: inotify_init")
       - ed8cae8b ("flag parameters: pipe")
       - 336dd1f7 ("flag parameters: dup2")
       - a0998b50 ("flag parameters: epoll_create")
       - 9fe5ad9c ("flag parameters add-on: remove
      						 epoll_create size param")
       - b087498e ("flag parameters: eventfd")
       - 9deb27ba ("flag parameters: signalfd")
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0e7d5bb8
    • L
      Revert "fbcon: bgcolor fix" · 3838f59f
      Linus Torvalds 提交于
      This reverts commit 2d04a4a7, which made
      it impossible to make the softcursor use the highlight colors.
      
      Yes, the fourth bit should be "blinking", but since we cannot reasonably
      blink in fbcon, highlighting it with a bright background is preferable.
      Reported-by: NPavel Machek <pavel@suse.cz>
      Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
      Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
      Cc: Antonino A. Daplas <adaplas@pol.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3838f59f
  3. 11 8月, 2008 28 次提交