Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.38-rc6
Commits on Feb 22, 2011
  1. @torvalds

    Linux 2.6.38-rc6

    torvalds authored
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ecryptfs/ecryptfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
      eCryptfs: Copy up lower inode attrs in getattr
      ecryptfs: read on a directory should return EISDIR if not supported
      eCryptfs: Handle NULL nameidata pointers
      eCryptfs: Revert "dont call lookup_one_len to avoid NULL nameidata"
Commits on Feb 21, 2011
  1. @torvalds

    drm/i915: Do not handle backlight combination mode specially

    Indan Zupancic authored torvalds committed
    The current code does not follow Intel documentation: It misses some things
    and does other, undocumented things. This causes wrong backlight values in
    certain conditions. Instead of adding tricky code handling badly documented
    and rare corner cases, don't handle combination mode specially at all. This
    way PCI_LBPC is never touched and weird things shouldn't happen.
    
    If combination mode is enabled, then the only downside is that changing the
    brightness has a greater granularity (the LBPC value), but LBPC is at most
    254 and the maximum is in the thousands, so this is no real functional loss.
    
    A potential problem with not handling combined mode is that a brightness of
    max * PCI_LBPC is not bright enough. However, this is very unlikely because
    from the documentation LBPC seems to act as a scaling factor and doesn't look
    like it's supposed to be changed after boot. The value at boot should always
    result in a bright enough screen.
    
    IMPORTANT: However, although usually the above is true, it may not be when
    people ran an older (2.6.37) kernel which messed up the LBPC register, and
    they are unlucky enough to have a BIOS that saves and restores the LBPC value.
    Then a good kernel may seem to not work: Max brightness isn't bright enough.
    If this happens people should boot back into the old kernel, set brightness
    to the maximum, and then reboot. After that everything should be fine.
    
    For more information see the below links. This fixes bugs:
    
      http://bugzilla.kernel.org/show_bug.cgi?id=23472
      http://bugzilla.kernel.org/show_bug.cgi?id=25072
    
    Signed-off-by: Indan Zupancic <indan@nul.nu>
    Tested-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    module: explicitly align module_version_attribute structure

    Dmitry Torokhov authored torvalds committed
    We force particular alignment when we generate attribute structures
    when generation MODULE_VERSION() data and we need to make sure that
    this alignment is followed when we iterate over these structures,
    otherwise we may crash on platforms whose natural alignment is not
    sizeof(void *), such as m68k.
    
    Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
    [ There are more issues here, but the fixes are incredibly ugly - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
      dell-laptop: Toggle the unsupported hardware killswitch
      thinkpad_acpi: Always report scancodes for hotkeys
      acer-wmi: Fix capitalisation of GUID
      platform/x86: ideapad-laptop depends on INPUT
      platform: x86: acer-wmi: world-writable sysfs threeg file
      platform: x86: asus_acpi: world-writable procfs files
      platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial files
      platform-drivers: x86: pmic: Use request_irq instead of chained handler
      platform-drivers: x86: pmic: Use irq_chip buslock mechanism
      platform-drivers: x86: Convert pmic to new irq_chip functions
      platform-drivers: x86: pmic: Fix up bogus irq hackery
  4. @torvalds

    Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      fixdep: Do not record dependency on the source file itself
  5. @torvalds

    Docbook: add fs/eventfd.c and fix typos in it

    Randy Dunlap authored torvalds committed
    Add fs/eventfd.c to filesystems docbook.
    Make typo corrections in fs/eventfd.c.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Davide Libenzi <davidel@xmailserver.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Documentation: log_buf_len uses [KMG] suffix

    Randy Dunlap authored torvalds committed
    Update the "log_buf_len" description to use [KMG] syntax for the
    buffer size.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @a-darwish @torvalds

    Documentation: explain [KMG] parameter suffix

    a-darwish authored torvalds committed
    The '[KMG]' suffix is commonly described after a number of kernel
    parameter values documentation.  Explicitly state its semantics.
    
    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @a-darwish @torvalds

    Documentation: complete crashkernel= parameter documentation

    a-darwish authored torvalds committed
    Complete the crashkernel= kernel parameter documentation.
    
    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    Acked-by: Simon Horman <horms@verge.net.au>
    Acked-by: Vivek Goyal <vgoyal@redhat.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: keep reference to parent inode on ceph_dentry
      ceph: queue cap_snaps once per realm
      libceph: fix socket write error handling
      libceph: fix socket read error handling
  10. @torvalds

    Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: S5PV210: Fix regulator names
      ARM: S5PV210: Update max8998_platform_data
      ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata
      ARM: S5P: Fix end address in memory resource information for UART devices
      ARM: S5P64X0: Cleanup map.h file
      ARM: S5P6442: Cleanup map.h file
      ARM: S5PC100: Clenaup map.h file
      ARM: S5PV210: Cleanup map.h file
      ARM: S5PV310: Cleanup map.h file
  11. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] update cifs version
      cifs: Fix regression in LANMAN (LM) auth code
      cifs: fix handling of scopeid in cifs_convert_address
  12. @torvalds

    Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6745/1: kprobes insn decoding fix
      ARM: tlb: move noMMU tlb_flush() to asm/tlb.h
      ARM: tlb: delay page freeing for SMP and ARMv7 CPUs
      ARM: Keep exit text/data around for SMP_ON_UP
      ARM: Ensure predictable endian state on signal handler entry
      ARM: 6740/1: Place correctly notes section in the linker script
      ARM: 6700/1: SPEAr: Correct SOC config base address for spear320
      ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset
      ARM: 6712/1: SPEAr: replace readl(), writel() with relaxed versions in uncompress.h
      ARM: 6720/1: SPEAr: Append UL to VMALLOC_END
      ARM: 6676/1: Correct the cpu_architecture() function for ARMv7
      ARM: 6739/1: update .gitignore for boot/compressed
      ARM: 6743/1: errata: interrupted ICALLUIS may prevent completion of broadcasted operation
      ARM: 6742/1: pmu: avoid setting IRQ affinity on UP systems
      ARM: 6741/1: errata: pl310 cache sync operation may be faulty
  13. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] net: provide architecture specific NET_SKB_PAD
      [S390] atomic: use inline asm
      [S390] correct ipl parameter block safe guard
      [S390] atomic: use ACCESS_ONCE() for atomic_read()
      [S390] dasd: correct device table
  14. [CIFS] update cifs version

    Steve French authored
    Update version to 1.71 so we can more easily spot modules with the last two fixes
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>
  15. dell-laptop: Toggle the unsupported hardware killswitch

    Keng-Yu Lin authored Matthew Garrett committed
    It is found on Dell Inspiron 1018 that the firmware reports that the hardware
    killswitch is not supported. This makes the rfkill key not functional.
    
    This patch forces the driver to toggle the firmware rfkill status in the case
    that the hardware killswitch is indicated as unsupported by the firmware.
    
    Signed-off-by: Keng-Yu Lin <keng-yu.lin@canonical.com>
    Tested-by: Alessio Igor Bogani <abogani@texware.it>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  16. thinkpad_acpi: Always report scancodes for hotkeys

    Seth Forshee authored Matthew Garrett committed
    Some thinkpad hotkeys report key codes like KEY_FN_F8 when something
    like KEY_VOLUMEDOWN is desired. Always provide the scan codes in
    addition to the key codes to assist with debugging these issues. Also
    send the scan code before the key code to match what other drivers do,
    as some userspace utilities expect this ordering.
    
    Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  17. acer-wmi: Fix capitalisation of GUID

    Matthew Garrett authored
    6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3 needs to be
    6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3 to match the hardware alias.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Cc: stable@kernel.org
  18. platform/x86: ideapad-laptop depends on INPUT

    Randy Dunlap authored Matthew Garrett committed
    Most platform/x86 drivers that use INPUT_SPARSEKMAP also depend on INPUT,
    so do the same for ideapad-laptop.  This fixes a kconfig warning and
    subsequent build errors when CONFIG_INPUT is disabled.
    
    warning: (ACER_WMI && ASUS_LAPTOP && DELL_WMI && HP_WMI && PANASONIC_LAPTOP && IDEAPAD_LAPTOP && EEEPC_LAPTOP && EEEPC_WMI && MSI_WMI && TOPSTAR_LAPTOP && ACPI_TOSHIBA) selects INPUT_SPARSEKMAP which has unmet direct dependencies (!S390 && INPUT)
    
    ERROR: "input_free_device" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "input_register_device" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "sparse_keymap_setup" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "input_allocate_device" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "input_unregister_device" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "sparse_keymap_free" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    ERROR: "sparse_keymap_report_event" [drivers/platform/x86/ideapad-laptop.ko] undefined!
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Cc: Matthew Garrett <mjg@redhat.com>
    Cc: platform-driver-x86@vger.kernel.org
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  19. platform: x86: acer-wmi: world-writable sysfs threeg file

    Vasiliy Kulikov authored Matthew Garrett committed
    Don't allow everybody to write to hardware registers.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  20. platform: x86: asus_acpi: world-writable procfs files

    Vasiliy Kulikov authored Matthew Garrett committed
    Don't allow everybody to change ACPI settings.  The comment says that it
    is done deliberatelly, however, the comment before disp_proc_write()
    says that at least one of these setting is experimental.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  21. platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial …

    Vasiliy Kulikov authored Matthew Garrett committed
    …files
    
    Don't allow everybody to change WMI settings.
    
    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  22. platform-drivers: x86: pmic: Use request_irq instead of chained handler

    Thomas Gleixner authored Matthew Garrett committed
    There is no need to install a chained handler for this hardware. This
    is a plain x86 IOAPIC interrupt which is handled by the core code
    perfectly fine. There is nothing special about demultiplexing these
    gpio interrupts which justifies a custom hack. Replace it by a plain
    old interrupt handler installed with request_irq. That makes the code
    agnostic about the underlying primary interrupt hardware. The overhead
    for this is minimal, but it gives us the advantage of accounting,
    balancing and to detect interrupt storms. gpio interrupts are not
    really that performance critical.
    
    Patch fixups from akpm
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  23. @shirishpargaonkar

    cifs: Fix regression in LANMAN (LM) auth code

    shirishpargaonkar authored Steve French committed
    LANMAN response length was changed to 16 bytes instead of 24 bytes.
    Revert it back to 24 bytes.
    
    Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
    CC: stable@kernel.org
    Signed-off-by: Steve French <sfrench@us.ibm.com>
  24. eCryptfs: Copy up lower inode attrs in getattr

    Tyler Hicks authored
    The lower filesystem may do some type of inode revalidation during a
    getattr call. eCryptfs should take advantage of that by copying the
    lower inode attributes to the eCryptfs inode after a call to
    vfs_getattr() on the lower inode.
    
    I originally wrote this fix while working on eCryptfs on nfsv3 support,
    but discovered it also fixed an eCryptfs on ext4 nanosecond timestamp
    bug that was reported.
    
    https://bugs.launchpad.net/bugs/613873
    
    Cc: <stable@kernel.org>
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  25. ecryptfs: read on a directory should return EISDIR if not supported

    Andy Whitcroft authored Tyler Hicks committed
    read() calls against a file descriptor connected to a directory are
    incorrectly returning EINVAL rather than EISDIR:
    
      [EISDIR]
        [XSI] [Option Start] The fildes argument refers to a directory and the
        implementation does not allow the directory to be read using read()
        or pread(). The readdir() function should be used instead. [Option End]
    
    This occurs because we do not have a .read operation defined for
    ecryptfs directories.  Connect this up to generic_read_dir().
    
    BugLink: http://bugs.launchpad.net/bugs/719691
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  26. eCryptfs: Handle NULL nameidata pointers

    Tyler Hicks authored
    Allow for NULL nameidata pointers in eCryptfs create, lookup, and
    d_revalidate functions.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
  27. ARM: 6745/1: kprobes insn decoding fix

    Nicolas Pitre authored Russell King committed
    Marcin Slusarz says:
    
    > In arch/arm/kernel/kprobes-decode.c there's a function
    > arm_kprobe_decode_insn which does:
    >
    > } else if ((insn & 0x0e000000) == 0x0c400000) {
    > ...
    >
    > This is always false, so code below is dead.
    > I found this bug by coccinelle (http://coccinelle.lip6.fr/).
    
    Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  28. ARM: tlb: move noMMU tlb_flush() to asm/tlb.h

    Russell King authored
    There's no need to noMMU to put tlb_flush() in asm/tlbflush.h - it's
    part of the tlb shootdown interface.  Move it to asm/tlb.h instead, as
    per x86.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  29. ARM: tlb: delay page freeing for SMP and ARMv7 CPUs

    Russell King authored
    We need to delay freeing any mapped page on SMP and ARMv7 systems to
    ensure that the data is not accessed by other CPUs, or is used for
    speculative prefetch with ARMv7.  This includes not only mapped pages
    but also pages used for the page tables themselves.
    
    This avoids races with the MMU/other CPUs accessing pages after they've
    been freed but before we've invalidated the TLB.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  30. ARM: Keep exit text/data around for SMP_ON_UP

    Russell King authored
    When SMP_ON_UP is used and the spinlocks are inlined, we end up with
    inline spinlocks in the exit code, with references from the SMP
    alternatives section to the exit sections.  This causes link time
    errors.  Avoid this by placing the exit sections in the init-discarded
    region.
    
    Cc: <stable@kernel.org>
    Tested-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  31. ARM: Ensure predictable endian state on signal handler entry

    Russell King authored
    Ensure a predictable endian state when entering signal handlers.  This
    avoids programs which use SETEND to momentarily switch their endian
    state from having their signal handlers entered with an unpredictable
    endian state.
    
    Cc: <stable@kernel.org>
    Acked-by: Dave Martin <dave.martin@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  32. ARM: 6740/1: Place correctly notes section in the linker script

    Pawel Moll authored Russell King committed
    Commit 1899119 added --build-id
    linker option when toolchain supports it. ARM one does, but for some
    reason places the section at 0 when linker script doesn't mention it
    explicitly.
    
    The 1e621a8 worked around the problem
    removing this section from binary image with explicit objcopy options,
    but it still exists in vmlinux, confusing tools like debuggers and perf.
    
    This problem was discussed here:
    http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html
    http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html
    but the proposed changes to the linker script were substantial.
    
    This patch simply places NOTES (36 bytes long, at least when compiled
    with CodeSourcery toolchain) between data and bss, which seem to be
    the right place (and suggested by the sample linker script in
    include/asm-generic/vmlinux.lds.h).
    
    It is enough to place it correctly in vmlinux (so debuggers are happy):
    
    Section Headers:
      [11] .data             PROGBITS        c07ce000 7ce000 020fc0 00  WA  0   0 32
      [12] .notes            NOTE            c07eefc0 7eefc0 000024 00  AX  0   0  4
      [13] .bss              NOBITS          c07ef000 7eefe4 01e628 00  WA  0   0 32
    Program Headers:
      LOAD           0x008000 0xc0008000 0xc0008000 0x7e6fe4 0x805628 RWE 0x8000
      NOTE           0x7eefc0 0xc07eefc0 0xc07eefc0 0x00024 0x00024 R E 0x4
    Section to Segment mapping:
      Segment Sections...
       00     <...> .data .notes .bss
       01     .notes
    
    and to get it exposed as /sys/kernel/notes used by perf tools.
    
    Signed-off-by: Pawel Moll <pawel.moll@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  33. ARM: 6700/1: SPEAr: Correct SOC config base address for spear320

    viresh kumar authored Russell King committed
    SPEAR320_SOC_CONFIG_BASE was wrong, causing the wrong registers to be
    accessed.
    
    Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
    Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Something went wrong with that request. Please try again.