01 Jul, 2009

29 commits

  • Maximum file size for hostfs mounts defaults to 2GB, so bigger files cannot be
    read/written through hostfs. This patch initializes the maximum file size to
    MAX_LFS_SIZE.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13531

    Signed-off-by: Wolfgang Illmeyer
    Cc: Jeff Dike
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wolfgang Illmeyer
     
  • A crappy macro prevents us unlocking on a fail path.

    Expand the macro and unlock appropriatelly.

    Signed-off-by: Jiri Slaby
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     
  • Make sure we do not actually request the RTC IRQ until the device driver
    is fully ready to handle and process any interrupt. This way a spurious
    interrupt won't crash the system (which may happen if the bootloader was
    poking the RTC right before booting Linux).

    Signed-off-by: Mike Frysinger
    Signed-off-by: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • Block writes require 64 byte alignment. Since block writes could be used
    with SGRAM or WRAM also refine the memory type detection to check for
    either type before deciding to use the 64 byte alignment.

    Signed-off-by: Ville Syrjala
    Tested-by: Mikulas Patocka
    Cc: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ville Syrjala
     
  • Apparently HP OmniBook 500's BIOS doesn't like the way atyfb reprograms
    the hardware. The BIOS will simply hang after a reboot. Fix the problem
    by restoring the hardware to it's original state on reboot.

    Signed-off-by: Ville Syrjala
    Cc: Mikulas Patocka
    Cc: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ville Syrjala
     
  • IRQ handling is wrong for any GPIO >= PL061_GPIO_NR.

    Fix this by implementing and using a proper .to_irq method.

    Signed-off-by: Baruch Siach
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Baruch Siach
     
  • Note that IRQ has not been initialized when kmalloc() fails.

    Also, use DECLARE_BITMAP() to make the code clearer.

    Signed-off-by: Baruch Siach
    Cc: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Baruch Siach
     
  • Nathan reported that

    | commit 73d60b7f747176dbdff826c4127d22e1fd3f9f74
    | Author: Yinghai Lu
    | Date: Tue Jun 16 15:33:00 2009 -0700
    |
    | page-allocator: clear N_HIGH_MEMORY map before we set it again
    |
    | SRAT tables may contains nodes of very small size. The arch code may
    | decide to not activate such a node. However, currently the early boot
    | code sets N_HIGH_MEMORY for such nodes. These nodes therefore seem to be
    | active although these nodes have no present pages.
    |
    | For 64bit N_HIGH_MEMORY == N_NORMAL_MEMORY, so that works for 64 bit too

    unintentionally and incorrectly clears the cpuset.mems cgroup attribute on
    an i386 kvm guest, meaning that cpuset.mems can not be used.

    Fix this by only clearing node_states[N_NORMAL_MEMORY] for 64bit only.
    and need to do save/restore for that in find_zone_movable_pfn

    Reported-by: Nathan Lynch
    Tested-by: Nathan Lynch
    Signed-off-by: Yinghai Lu
    Cc: Christoph Lameter
    Cc: Ingo Molnar ,
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yinghai Lu
     
  • By writing a tasks's pid to the file, a process adds that task to that
    cgroup/cpuset. But to add a cpu/mem to a cpuset, the new list of cpus
    should be written to the cpuset.mems file which would replace the old list
    of cpus. Make this clearer in the documentation.

    Signed-off-by: Nikanth Karthikesan
    Signed-off-by: Li Zefan
    Acked-by: Paul Menage
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nikanth Karthikesan
     
  • balance_dirty_pages can overreact and move all of the dirty pages to
    writeback unnecessarily.

    balance_dirty_pages makes its decision to throttle based on the number of
    dirty plus writeback pages that are over the calculated limit,so it will
    continue to move pages even when there are plenty of pages in writeback
    and less than the threshold still dirty.

    This allows it to overshoot its limits and move all the dirty pages to
    writeback while waiting for the drives to catch up and empty the writeback
    list.

    A simple fio test easily demonstrates this problem.

    fio --name=f1 --directory=/disk1 --size=2G -rw=write --name=f2 --directory=/disk2 --size=1G --rw=write --startdelay=10

    This is the simplest fix I could find, but I'm not entirely sure that it
    alone will be enough for all cases. But it certainly is an improvement on
    my desktop machine writing to 2 disks.

    Do we need something more for machines with large arrays where
    bdi_threshold * number_of_drives is greater than the dirty_ratio ?

    Signed-off-by: Richard Kennedy
    Acked-by: Peter Zijlstra
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Kennedy
     
  • The file opened in acct_on and freshly stored in the ns->bacct struct can
    be closed in acct_file_reopen by a concurrent call after we release
    acct_lock and before we call mntput(file->f_path.mnt).

    Record file->f_path.mnt in a local variable and use this variable only.

    Signed-off-by: Renaud Lottiaux
    Signed-off-by: Louis Rilling
    Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Renaud Lottiaux
     
  • Ion's cs.columbia.edu email address no longer works.

    Signed-off-by: Joe Perches
    Acked-by: Ion Badulescu
    Cc: "David S. Miller"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • When the 32-bit signed quantities get assigned to the u64 resource_size_t,
    they are incorrectly sign-extended.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13253
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9905

    Signed-off-by: Zhang Rui
    Reported-by: Leann Ogasawara
    Cc: Pierre Ossman
    Reported-by:
    Tested-by:
    Cc:
    Cc: Jesse Barnes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zhang Rui
     
  • Bugfix to spi_bitbang infrastructure: make sure to always set transfer
    parameters on the first pass through the message's per-transfer loop.
    This can matter with drivers that replace the per-word or per-buffer
    transfer primitives, on busses with multiple SPI devices.

    Previously, this could have started messages using the settings left after
    previous messages. The problem was observed when a high speed chip
    (m25p80 type flash) was running very slowly because a low speed device
    (avr8 microcontroller) had previously used the bus. Similar faults could
    have driven the low speed device too fast, or used an unexpected word
    size.

    Acked-by: Steven A. Falco
    Signed-off-by: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Brownell
     
  • Add a mutex to avoid a circular locking problem between the mm layer
    semaphore and fbdev ioctl mutex through the fb_mmap() call.

    Also, add mutex to all places where smem_start and smem_len fields change
    so the mutex inside the fb_mmap() is actually used. Changing of these
    fields before calling the framebuffer_register() are not mutexed.

    This is 2.6.31 material. It removes one lockdep (fb_mmap() and
    register_framebuffer()) but there is still another one (fb_release() and
    register_framebuffer()). It also cleans up handling of the smem_start and
    smem_len fields used by mutexed section of the fb_mmap().

    Signed-off-by: Krzysztof Helt
    Cc: Peter Zijlstra
    Cc: "Rafael J. Wysocki"
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • Add a new spi_master.flags word listing constraints relevant to that
    controller. Define the first constraint bit: a half duplex restriction.
    Include that constraint in the OMAP1 MicroWire controller driver.

    Have the mmc_spi host be the first customer of this flag. Its coding
    relies heavily on full duplex transfers, so it must fail when the
    underlying controller driver won't perform them.

    (The spi_write_then_read routine could use it too: use the
    temporarily-withdrawn full-duplex speedup unless this flag is set, in
    which case the existing code applies. Similarly, any spi_master
    implementing only SPI_3WIRE should set the flag.)

    Signed-off-by: David Brownell
    Cc: Marek Szyprowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Brownell
     
  • Add two new spi_device.mode bits to accomodate more protocol options, and
    pass them through to usermode drivers:

    * SPI_NO_CS ... a second 3-wire variant, where the chipselect
    line is removed instead of a data line; transfers are still
    full duplex.

    This obviously has STRONG protocol implications since the
    chipselect transitions can't be used to synchronize state
    transitions with the SPI master.

    * SPI_READY ... defines open drain signal that's pulled low
    to pause the clock. This defines a 5-wire variant (normal
    4-wire SPI plus READY) and two 4-wire variants (READY plus
    each of the 3-wire flavors).

    Such hardware flow control can be a big win. There are ADC
    converters and flash chips that expose READY signals, but not
    many host controllers support it today.

    The spi_bitbang code should be changed to use SPI_NO_CS instead of its
    current nonportable hack. That's a mode most hardware can easily support
    (unlike SPI_READY).

    Signed-off-by: David Brownell
    Cc: "Paulraj, Sandeep"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Brownell
     
  • show_pools() walks the page_list of a pool w/o protection against the list
    modifications in alloc/free. Take pool->lock to avoid stomping into
    nirvana.

    Signed-off-by: Thomas Gleixner
    Signed-off-by: Matthew Wilcox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     
  • ext2_iget() returns -ESTALE if invoked on a deleted inode, in order to
    report errors to NFS properly. However, in ext[234]_lookup(), this
    -ESTALE can be propagated to userspace if the filesystem is corrupted such
    that a directory entry references a deleted inode. This leads to a
    misleading error message - "Stale NFS file handle" - and confusion on the
    part of the admin.

    The bug can be easily reproduced by creating a new filesystem, making a
    link to an unused inode using debugfs, then mounting and attempting to ls
    -l said link.

    This patch thus changes ext2_lookup to return -EIO if it receives -ESTALE
    from ext2_iget(), as ext2 does for other filesystem metadata corruption;
    and also invokes the appropriate ext*_error functions when this case is
    detected.

    Signed-off-by: Bryan Donlan
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bryan Donlan
     
  • With ELF, at generating coredump, some more headers other than used
    vmas are added.

    When max_map_count == 65536, a core generated by following kinds of
    code can be unreadable because the number of ELF's program header is
    written in 16bit in Ehdr (please see elf.h) and the number overflows.

    ==
    ... = mmap(); (munmap, mprotect, etc...)
    if (failed)
    abort();
    ==

    This can happen in mmap/munmap/mprotect/etc...which calls split_vma().

    I think 65536 is not safe as _default_ and reduce it to 65530 is good
    for avoiding unexpected corrupted core.

    Anyway, max_map_count can be enlarged by sysctl if a user is brave..

    Signed-off-by: KAMEZAWA Hiroyuki
    Cc: Hugh Dickins
    Cc: Jakub Jelinek
    Acked-by: Roland McGrath
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KAMEZAWA Hiroyuki
     
  • Since some new MPC85xx SOCs support DDR3 memory now, so add DDR3 memory
    type for MPC85xx EDAC.

    Signed-off-by: Yang Shi
    Cc: Doug Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yang Shi
     
  • Add support for the PCI-Express NetMos 9901 Multi-IO card.

    0001:06:00.0 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.1 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.2 Parallel controller [0701]: NetMos Technology Device [9710:9901] (prog-if 03 [IEEE1284])
    Subsystem: Device [a000:2000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Region 2: Memory at 80101000 (32-bit, non-prefetchable) [size=4K]
    Region 4: Memory at 80100000 (32-bit, non-prefetchable) [size=4K]
    Capabilities:
    Kernel driver in use: parport_pc
    Kernel modules: parport_pc

    [ 16.760181] PCI parallel port detected: 416c:0100, I/O at 0x812010(0x0), IRQ 65
    [ 16.760225] parport0: PC-style at 0x812010, irq 65 [PCSPP,TRISTATE,EPP]
    [ 16.851842] serial 0001:06:00.0: enabling device (0004 -> 0007)
    [ 16.883776] 0001:06:00.0: ttyS0 at I/O 0x812030 (irq = 65) is a ST16650V2
    [ 16.893832] serial 0001:06:00.1: enabling device (0004 -> 0007)
    [ 16.926537] 0001:06:00.1: ttyS1 at I/O 0x812020 (irq = 65) is a ST16650V2

    Signed-off-by: Michael Buesch
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Buesch
     
  • Commonly available versions of cp and tar don't work well with special
    files created using seq_file. Mention this problem in the gcov
    documentation and update the helper script example to work around these
    problems.

    Signed-off-by: Peter Oberparleiter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Oberparleiter
     
  • alpha percpu access requires custom SHIFT_PERCPU_PTR() definition for
    modules to work around addressing range limitation. This is done via
    generating inline assembly using C preprocessing which forces the
    assembler to generate external reference. This happens behind the
    compiler's back and makes the compiler think that static percpu variables
    in modules are unused.

    This used to be worked around by using __unused attribute for percpu
    variables which prevent the compiler from omitting the variable; however,
    recent declare/definition attribute unification change broke this as
    __used can't be used for declaration. Also, in the process,
    PER_CPU_ATTRIBUTES definition in alpha percpu.h got broken.

    This patch adds PER_CPU_DEF_ATTRIBUTES which is only used for definitions
    and make alpha use it to add __used for percpu variables in modules. This
    also fixes the PER_CPU_ATTRIBUTES double definition bug.

    Signed-off-by: Tejun Heo
    Tested-by: maximilian attems
    Acked-by: Ivan Kokshaysky
    Cc: Richard Henderson
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tejun Heo
     
  • When building with a 4.1.x compiler on powerpc64 (at least) we get this
    error:

    drivers/video/logo/logo_linux_mono.c:81: error: logo_linux_mono causes a section type conflict

    This was introduced by commit ae52bb2384f721562f15f719de1acb8e934733cb
    ("fbdev: move logo externs to header file"). This is a partial revert of
    that commit sufficient to not hit the compiler bug.

    Also convert _clut arrays from __initconst to __initdata.

    Sam said:

    Al analysed this some time ago. When we say something is const then
    _sometimes_ gcc annotate the section as const(?) - sometimes not. So if
    we have two variables/functions annotated __*const and gcc decides to
    annotate the section const only in one case we get a section type
    conflict.

    Signed-off-by: Stephen Rothwell
    Cc: Sam Ravnborg
    Cc: Krzysztof Helt
    Cc: Geert Uytterhoeven
    Cc: Kyle McMartin
    Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • As per Ranganathan's request.

    Signed-off-by: Joe Perches
    Cc: Ranganathan Desikan
    Cc: Arvind R.
    Cc: Doug Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • The ctors section for each object file is eight byte aligned (on 64 bit).
    However the __ctors_start symbol starts at an arbitrary address dependent
    on the size of the previous sections.

    Therefore the linker may add some zeroes after __ctors_start to make sure
    the ctors contents are properly aligned. However the extra zeroes at the
    beginning aren't expected by the code. When walking the functions
    pointers contained in there and extra zeroes are added this may result in
    random jumps. So make sure that the __ctors_start symbol is always
    aligned as well.

    Fixes this crash on an allyesconfig on s390:

    [ 0.582482] Kernel BUG at 0000000000000012 [verbose debug info unavailable]
    [ 0.582489] illegal operation: 0001 [#1] SMP DEBUG_PAGEALLOC
    [ 0.582496] Modules linked in:
    [ 0.582501] CPU: 0 Tainted: G W 2.6.31-rc1-dirty #273
    [ 0.582506] Process swapper (pid: 1, task: 000000003f218000, ksp: 000000003f2238e8)
    [ 0.582510] Krnl PSW : 0704200180000000 0000000000000012 (0x12)
    [ 0.582518] R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:2 PM:0 EA:3
    [ 0.582524] Krnl GPRS: 0000000000036727 0000000000000010 0000000000000001 0000000000000001
    [ 0.582529] 00000000001dfefa 0000000000000000 0000000000000000 0000000000000040
    [ 0.582534] 0000000001fff0f0 0000000001790628 0000000002296048 0000000002296048
    [ 0.582540] 00000000020c438e 0000000001786000 0000000002014a66 000000003f223e60
    [ 0.582553] Krnl Code:>0000000000000012: 0000 unknown
    [ 0.582559] 0000000000000014: 0000 unknown
    [ 0.582564] 0000000000000016: 0000 unknown
    [ 0.582570] 0000000000000018: 0000 unknown
    [ 0.582575] 000000000000001a: 0000 unknown
    [ 0.582580] 000000000000001c: 0000 unknown
    [ 0.582585] 000000000000001e: 0000 unknown
    [ 0.582591] 0000000000000020: 0000 unknown
    [ 0.582596] Call Trace:
    [ 0.582599] ([] kernel_init+0x622/0x7a0)
    [ 0.582607] [] kernel_thread_starter+0x6/0xc
    [ 0.582615] [] kernel_thread_starter+0x0/0xc
    [ 0.582621] INFO: lockdep is turned off.
    [ 0.582624] Last Breaking-Event-Address:
    [ 0.582627] [] kernel_init+0x640/0x7a0

    Cc: Peter Oberparleiter
    Cc: Ingo Molnar
    Cc: Martin Schwidefsky
    Signed-off-by: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Heiko Carstens
     
  • Change the eventfd interface to de-couple the eventfd memory context, from
    the file pointer instance.

    Without such change, there is no clean way to racely free handle the
    POLLHUP event sent when the last instance of the file* goes away. Also,
    now the internal eventfd APIs are using the eventfd context instead of the
    file*.

    This patch is required by KVM's IRQfd code, which is still under
    development.

    Signed-off-by: Davide Libenzi
    Cc: Gregory Haskins
    Cc: Rusty Russell
    Cc: Benjamin LaHaise
    Cc: Avi Kivity
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davide Libenzi
     
  • Don't unlock on vfs_rejected_lock path in afs_do_setlk, since the lock
    is unlocked after abort_attempt label.

    Signed-off-by: Jiri Slaby
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Jiri Slaby
     

30 Jun, 2009

11 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
    ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ioctl HDIO_OBSOLETE_IDENTITY
    ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y
    ide-cd: handle fragmented packet commands gracefully
    ide: always kill the whole request on error
    ide: fix ide_kill_rq() for special ide-{floppy,tape} driver requests

    Linus Torvalds
     
  • …tl HDIO_OBSOLETE_IDENTITY

    This patch fixes a memory overrun in function ide_get_identity_ioctl() which
    chooses the size of a memory buffer depending on the ioctl command that led
    to the function call, however, passes that buffer to a function which needs the
    buffer size to be always chosen unconditionally.

    Due to conditional compilation the memory overrun can only happen on big endian
    machines. The error can be triggered using ioctl HDIO_OBSOLETE_IDENTITY. Usage
    of ioctl HDIO_GET_IDENTITY is safe.

    Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com>
    Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

    Christian Engelmayer
     
  • commit 2f0d0fd2a605666d38e290c5c0d2907484352dc4 ("ide-acpi: cleanup
    do_drive_get_GTF()") didn't account for the lack of hwif->acpidata
    check in generic_ide_suspend() [ indirect user of do_drive_get_GTF()
    through ide_acpi_exec_tfs() ] resulting in broken resume when ACPI
    support is enabled but ACPI data is unavailable.

    Fix it by adding ide_port_acpi() helper for checking if port needs
    ACPI handling and cleaning generic_ide_{suspend,resume}() to use it
    instead of hiding hwif->acpidata and ide_noacpi checks in IDE ACPI
    helpers (this should help in preventing similar bugs in the future).

    While at it:
    - kill superfluous debugging printks in ide_acpi_{get,push}_timing()

    Reported-and-tested-by: Etienne Basset
    Also-reported-and-tested-by: Jeff Chua
    Signed-off-by: Bartlomiej Zolnierkiewicz
    Signed-off-by: David S. Miller

    Bartlomiej Zolnierkiewicz
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
    [ARM] 5562/2: at91: add gpio button support for at91sam9g20ek
    [ARM] 5563/1: at91: at91sam9rlek lcd interface correction
    [ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script
    [ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQ
    [ARM] GTA02: build fixes (s3c2410_nand_set usage)
    [ARM] MINI2440: Add missing flash_bbt flat to NAND
    [ARM] s3c2410_defconfig: add MINI2440 machine to build
    [ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
    [ARM] S3C24XX: Fix missing s3c_iis_device.
    [ARM] MINI2440: remove duplicated #include
    [ARM] S3C24XX: Fix spi-bus configuration build errors
    OMAP: Fix IOMEM macro for assembly
    [ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORT
    [ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWM
    OMAP2/3: Initialize gpio debounce register
    OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry
    OMAP3: RX51: Use OneNAND sync read / write
    OMAP2/3: gpmc-onenand: correct use of async timings
    OMAP3: DMA: Enable idlemodes for DMA OCP
    OMAP3: SRAM size fix for HS/EMU devices
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.infradead.org/users/eparis/notify:
    fs: allow d_instantiate to be called with negative parent dentry

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    sound: OSS: mpu401, fix deadlock
    ALSA: hda - Add missing initializations for ALC268 and ALC269
    ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
    ALSA: hda - Line In for Acer Inspire 6530G model
    sound: oxygen: make mic volume control mono
    MAINTAINERS: Add entry for twl4030 series soc codec driver
    ALSA: lx6464es - configure ethersound io channels
    sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
    sound: Use PCI_VDEVICE
    ALSA: hda - Use model=acer-aspire-6530g for Acer Aspire 6930G
    ALSA: hda - Fix acer-aspire-6530g model quirk
    ALSA: hda - Add pin-sense trigger when needed for Realtek codecs
    ALSA: hda - Fix support for Samsung P50 with AD1986A codec
    ALSA: hda - Generalize the pin-detect quirk for Lenovo N100
    ALSA: hda - Simplify AD1986A mixer definitions

    Linus Torvalds
     
  • …/security-testing-2.6

    * 'bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    integrity: add ima_counts_put (updated)
    integrity: ima audit hash_exists fix
    integrity: ima mq_open imbalance msg fix

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    Revert "x86: cap iomem_resource to addressable physical memory"

    Linus Torvalds
     
  • * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
    backlight: Fix tdo24m crash on kmalloc

    Linus Torvalds
     
  • FYI, there's a post-rc1 build regression with certain configs:

    drivers/built-in.o: In function `pci_hp_deregister':
    (.text+0xb166): undefined reference to `pci_hp_remove_module_link'
    drivers/built-in.o: In function `pci_hp_deregister':
    (.text+0xb19f): undefined reference to `pci_destroy_slot'
    drivers/built-in.o: In function `__pci_hp_register':
    (.text+0xb583): undefined reference to `pci_create_slot'
    drivers/built-in.o: In function `__pci_hp_register':
    (.text+0xb5b1): undefined reference to `pci_hp_create_module_link'
    make: *** [.tmp_vmlinux1] Error 1

    Caused by:

    | 2b121bc262fa03c94e653b2d44356c2f86c1bcdc is first bad commit
    | commit 2b121bc262fa03c94e653b2d44356c2f86c1bcdc
    | Date: Thu Jun 25 13:25:36 2009 +0200
    |
    | eeepc-laptop: Register as a pci-hotplug device

    which changed the driver to use the PCI hotplug infrastructure, but
    didn't do a good job on the Kconfig rules.

    Signed-off-by: Ingo Molnar
    Acked-by: Randy Dunlap
    Acked-by: Len Brown
    Signed-off-by: Linus Torvalds

    Ingo Molnar
     
  • Currently we reinit the ldisc on final tty close which is what the old code
    did to ensure that if the device retained its termios settings then it had the
    right ldisc. tty_ldisc_reinit does that but also leaves us with the reset
    ldisc reference which is then leaked.

    At this point we know the port will be recycled so we can kill the ldisc
    off completely rather than try and add another ldisc free up when the kref
    count hits zero.

    At this point it is safe to keep the ldisc closed as tty_ldisc waiting
    methods are only used from the user side, and as the final close we are
    the last such reference. Interrupt/driver side methods will always use the
    non wait version and get back a NULL.

    Found with kmemleak and investigated/identified by Catalin Marinas.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox