28 Oct, 2008

25 commits


27 Oct, 2008

15 commits

  • * 'for-linus' of git://neil.brown.name/md:
    md: allow extended partitions on md devices.
    md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state
    md: use sysfs_notify_dirent to notify changes to md/array_state

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: psmouse - add support for Elantech touchpads
    Input: i8042 - add Blue FB5601 to noloop exception table

    Linus Torvalds
     
  • * 'for-linus' of git://git.o-hand.com/linux-mfd:
    mfd: Make WM8400 depend on I2C until SPI is submitted
    mfd: add missing Kconfig entry for da903x

    Linus Torvalds
     
  • * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
    uwb: build UWB before USB/WUSB

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: Add support for Sony Vaio VGX-TP1E
    HID: fix lock imbalance in hiddev
    HID: fix lock imbalance in hidraw
    HID: fix hidbus/appletouch device binding regression
    HID: add hid_type to general hid struct
    HID: quirk for OLED devices present in ASUS G50/G70/G71
    HID: Remove "default m" for Thrustmaster and Zeroplus
    HID: fix hidraw_exit section mismatch
    HID: add support for another Gyration remote control
    Revert "HID: Invert HWHEEL mappings for some Logitech mice"

    Linus Torvalds
     
  • Fix docbook fatal errors (file location changed):

    docproc: lin2628-rc1/include/asm-x86/io_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1

    docproc: lin2628-rc1/include/asm-x86/atomic_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1

    docproc: lin2628-rc1/include/asm-x86/mca_dma.h: No such file or directory
    make[1]: *** [Documentation/DocBook/mcabook.xml] Error 1

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Allow macros that are annotated with kernel-doc to contain whitespace
    between the '#' and "define". It's valid and being used, so allow it.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    leds-hp-disk: fix build warning
    ACPI: Oops in ACPI with git latest
    ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
    toshiba_acpi: always call input_sync() after input_report_switch()
    ACPI: Always report a sync event after a lid state change
    ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
    i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
    i7300_idle: Cleanup based review comments
    i7300_idle: Disable ioat channel only on platforms where ile driver can load

    Linus Torvalds
     
  • .. fix all the worst problems in -rc1

    Linus Torvalds
     
  • If CONFIG_AMIGA_BUILTIN_SERIAL=m, I get the following warnings:

    | drivers/char/amiserial.c: At top level:
    | drivers/char/amiserial.c:2138: warning: data definition has no type or storage class
    | drivers/char/amiserial.c:2138: warning: type defaults to 'int' in declaration of 'console_initcall'
    | drivers/char/amiserial.c:2138: warning: parameter names (without types) in function declaration
    | drivers/char/amiserial.c:2134: warning: 'amiserial_console_init' defined but not used

    because console_initcall() is not defined (nor really sensible) in the
    modular case.

    So disable serial console support if the driver is modular.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • In commit f337b9c58332bdecde965b436e47ea4c94d30da0 ("epoll: drop
    unnecessary test") Thomas found that there is an unnecessary (always
    true) test in ep_send_events(). The callback never inserts into
    ->rdllink while the send loop is performed, and also does the
    ~EP_PRIVATE_BITS test. Given we're holding the mutex during this time,
    the conditions tested inside the loop are always true.

    HOWEVER.

    The test "!ep_is_linked(&epi->rdllink)" wasn't there because we insert
    into ->rdllink, but because the send-events loop might terminate before
    the whole list is scanned (-EFAULT).

    In such cases, when the loop terminates early, and when a (leftover)
    file received an event while we're performing the lockless loop, we need
    such test to avoid to double insert the epoll items. The list_splice()
    done a few steps below, will correctly re-insert the ones that were left
    on "txlist".

    This should fix the kenrel.org bugzilla entry 11831.

    Signed-off-by: Davide Libenzi
    Signed-off-by: Linus Torvalds

    Davide Libenzi
     
  • Some userland apps seem to pass in a "0" for the seconds, and several
    seconds worth of usecs to select(). The old kernels accepted this just
    fine, so the new kernels must too.

    However, due to the upscaling of the microseconds to nanoseconds we had
    some cases where we got math overflow, and depending on the GCC version
    (due to inlining decisions) that actually resulted in an -EINVAL return.

    This patch fixes this by adding the excess microseconds to the seconds
    field.

    Also with thanks to Marcin Slusarz for spotting some implementation bugs
    in the diagnostics patches.

    Reported-by: Carlos R. Mafra
    Signed-off-by: Arjan van de Ven
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     
  • The default for the regulatory compatibility option is wrong;
    if you picked the default you ended up with a non-functional wifi
    system (at least I did on Fedora 9 with iwl4965).
    I don't think even the October 2008 releases of the various distros
    has the new userland so clearly the default is wrong, and also
    we can't just go about deleting this in 2.6.29...

    Change the default to "y" and also adjust the config text a little to
    reflect this.

    This patch fixes regression #11859

    With thanks to Johannes Berg for the diagnostics

    Signed-off-by: Arjan van de Ven
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     
  • /scratch/sfr/next/kernel/cgroup.c: In function 'cgroup_tasks_start':
    /scratch/sfr/next/kernel/cgroup.c:2107: warning: unused variable 'i'

    Introduced in commit cc31edceee04a7b87f2be48f9489ebb72d264844 "cgroups:
    convert tasks file to use a seq_file with shared pid array".

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
    hwmon: (abituguru3) enable DMI probing feature on AW9D-MAX
    hwmon: (abituguru3) Cosmetic whitespace fixes
    hwmon: (adt7473) Fix voltage conversion routines
    hwmon: (lm90) Add support for the LM99 16 degree offset
    hwmon: (lm90) Fix handling of hysteresis value
    hwmon-vid: Add support for AMD family 10h CPUs
    hwmon: (w83781d) Fix linking when built-in

    Linus Torvalds