28 Oct, 2008

9 commits


27 Oct, 2008

25 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
     
  • This reverts commit 7bf6bf4803df1adc927f585168d2135fb019c698.

    The code has both a short existence and an increasing track of failures
    despite some work to amend it for -rc1. It is not just a matter of
    reading the eeprom: sometimes the eeprom is read correctly, then the mac
    address is not written correctly back into the mac registers.

    Some chipsets seem to work reliably but it is not clear at this point if
    the code can simply be made to work on a per-chipset basis and post -rc1
    is not the place where I want to experiment these things.

    Signed-off-by: Francois Romieu
    Signed-off-by: Linus Torvalds

    Francois Romieu
     
  • a) semicolon before the function body is a bad idea
    b) it's const struct foo, not struct const foo
    c) incidentally, it's ecard_remove_driver(), not ecard_unregister_driver()
    d) compiling is occasionally useful.

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • If you use KCONFIG_ALLCONFIG (even with empty file) you get broken
    allmodconfig/allyesconfig; CONFIG_MODULES gets turned off, with obvious
    massive fallout.

    Breakage had been introduced when conf_set_all_new_symbols() got used
    for allmodconfig et.al.

    What happens is that sym_calc_value(modules_sym) done in
    conf_read_simple() sets SYMBOL_VALID on both modules_sym and MODULES.
    When we get to conf_set_all_new_symbols(), we set sym->def[S_DEF_USER]
    on everything, but it has no effect on sym->curr for the symbols that
    already have SYMBOL_VALID - these are stuck.

    Solution: use sym_clear_all_valid() in there. Note that it makes
    reevaluation of modules_sym redundant - sym_clear_all_valid() will do
    that itself.

    [ Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11512, says Alexey ]

    Signed-off-by: Al Viro
    Cc: Sam Ravnborg
    Cc: Roman Zippel
    Cc: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Switch the AW9D-MAX over from port probing to the preferred DMI
    probe method.

    Signed-off-by: Alistair John Strachan
    Tested-by: Justin Piszcz
    Acked-by: Hans de Goede
    Signed-off-by: Jean Delvare

    Alistair John Strachan
     
  • As the probable result of zealous copy/pasting, many supported boards
    contain sensor names with trailing whitespace. Though this is not a
    huge problem, it is inconsistent with other sensor names, and with
    other similar hwmon drivers.

    Additionally, the DMI nag message added in 2.6.27 was missing a
    space between two sentence fragments -- might as well clean that up
    too.

    Doesn't alter any kernel text, just data.

    Signed-off-by: Alistair John Strachan
    Reported-by: Justin Piszcz
    Acked-by: Hans de Goede
    Signed-off-by: Jean Delvare

    Alistair John Strachan
     
  • Fix voltage conversion routines. Based on an earlier patch from
    Paulius Zaleckas.

    According to the datasheet voltage is scaled with resistors and
    value 192 is nominal voltage. 0 is 0V.

    Signed-off-by: Jean Delvare
    Cc: Paulius Zaleckas
    Cc: Darrick J. Wong

    Jean Delvare
     
  • The LM99 differs from the LM86, LM89 and LM90 in that it reports
    remote temperatures (temp2) 16 degrees lower than they really are. So
    far we have been cheating and handled this in userspace but it really
    should be handled by the driver directly.

    Signed-off-by: Jean Delvare
    Cc: Matthew Garrett

    Jean Delvare
     
  • There are several problems in the way the hysteresis value is handled
    by the lm90 driver:

    * In show_temphyst(), specific handling of the MAX6646 is missing, so
    the hysteresis is reported incorrectly if the critical temperature
    is over 127 degrees C.
    * In set_temphyst(), the new hysteresis register value is written to
    the chip but data->temp_hyst isn't updated accordingly, so there is
    a short period of time (up to 2 seconds) where the old hystereris
    value will be returned while the new one is already active.
    * In set_temphyst(), the critical temperature which is used as a base
    to compute the value of the hysteresis register lacks
    device-specific handling. As a result, the value of the hysteresis
    register might be incorrect for the ADT7461 and MAX6646 chips.

    Fix these 3 bugs.

    Signed-off-by: Jean Delvare
    Cc: Ben Hutchings
    Cc: Nate Case

    Jean Delvare
     
  • The AMD family 10h CPUs use the same VID decoding table as the family
    0Fh CPUs.

    Signed-off-by: Jean Delvare
    Cc: Rudolf Marek

    Jean Delvare
     
  • When w83781d is built-in, the final links fails with the following vague error
    message:

    `.exit.text' referenced in section `.init.text' of drivers/built-in.o: defined
    in discarded section `.exit.text' of drivers/built-in.o

    w83781d_isa_unregister() cannot be marked __exit, as it's also called from
    sensors_w83781d_init(), which is marked __init.

    Signed-off-by: Geert Uytterhoeven
    Cc: Wolfgang Grandegger
    Signed-off-by: Jean Delvare

    Geert Uytterhoeven
     

26 Oct, 2008

4 commits

  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: Fix duplicate entries returned from getdents() system call
    ext3: Fix duplicate entries returned from getdents() system call

    Linus Torvalds
     
  • This reverts commit a802dd0eb5fc97a50cf1abb1f788a8f6cc5db635 by moving
    the call to init_workqueues() back where it belongs - after SMP has been
    initialized.

    It also moves stop_machine_init() - which needs workqueues - to a later
    phase using a core_initcall() instead of early_initcall(). That should
    satisfy all ordering requirements, and was apparently the reason why
    init_workqueues() was moved to be too early.

    Cc: Heiko Carstens
    Cc: Rusty Russell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Fix a regression caused by commit d0156417, "ext4: fix ext4_dx_readdir
    hash collision handling", where deleting files in a large directory
    (requiring more than one getdents system call), results in some
    filenames being returned twice. This was caused by a failure to
    update info->curr_hash and info->curr_minor_hash, so that if the
    directory had gotten modified since the last getdents() system call
    (as would be the case if the user is running "rm -r" or "git clean"),
    a directory entry would get returned twice to the userspace.

    Signed-off-by: "Theodore Ts'o"

    This patch fixes the bug reported by Markus Trippelsdorf at:
    http://bugzilla.kernel.org/show_bug.cgi?id=11844

    Signed-off-by: "Theodore Ts'o"
    Tested-by: Markus Trippelsdorf

    Theodore Ts'o
     
  • Fix a regression caused by commit 6a897cf4, "ext3: fix ext3_dx_readdir
    hash collision handling", where deleting files in a large directory
    (requiring more than one getdents system call), results in some
    filenames being returned twice. This was caused by a failure to
    update info->curr_hash and info->curr_minor_hash, so that if the
    directory had gotten modified since the last getdents() system call
    (as would be the case if the user is running "rm -r" or "git clean"),
    a directory entry would get returned twice to the userspace.

    This patch fixes the bug reported by Markus Trippelsdorf at:
    http://bugzilla.kernel.org/show_bug.cgi?id=11844

    Signed-off-by: "Theodore Ts'o"
    Tested-by: Markus Trippelsdorf

    Theodore Ts'o
     

25 Oct, 2008

2 commits