30 Mar, 2011

1 commit


19 Mar, 2011

15 commits

  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI: label: remove #include of ACPI header to avoid warnings
    PCI: label: Fix compilation error when CONFIG_ACPI is unset
    PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
    PCI: introduce reset_resource()
    PCI: data structure agnostic free list function
    PCI: refactor io size calculation code
    PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
    PCI hotplug: acpiphp: set current_state to D0 in register_slot
    PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
    PCI: add more checking to ICH region quirks
    PCI: aer-inject: Override PCIe AER Mask Registers
    PCI: fix tlan build when CONFIG_PCI is not enabled
    PCI: remove quirk for pre-production systems
    PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
    PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
    PCI: sysfs: Fix failure path for addition of "vpd" attribute

    Linus Torvalds
     
  • * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
    spi/dw_spi: move dw_spi.h into drivers/spi
    spi/dw_spi: Fix missing header
    gpio/langwell: Clear edge bit before handling
    gpio/langwell: Simplify demux loop
    gpio/langwell: Convert irq name space
    gpio/langwell: Fix broken irq_eoi change.
    gpio; Make Intel chipset gpio drivers depend on x86
    gpio/cs5535-gpio: Fix section mismatch
    spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices
    spi/davinci: Support DMA transfers larger than 65535 words
    spi/davinci: Use correct length parameter to dma_map_single calls
    gpio: Use __devexit at necessary places
    gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio
    gpio/mcp23s08: support mcp23s17 variant
    of_mmc_spi: add card detect irq support
    spi/omap_mcspi: catch xfers of non-multiple SPI word size
    spi/omap_mcspi: Off-by-one error in finding the right divisor
    gpio/pca953x: Fix wrong pointer type
    spi/pl022: rid dangling labels
    spi: add support for SuperH SPI
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
    dlm: use alloc_workqueue function
    dlm: increase default hash table sizes
    dlm: record full callback state

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    fs: call security_d_instantiate in d_obtain_alias V2
    lose 'mounting_here' argument in ->d_manage()
    don't pass 'mounting_here' flag to follow_down()
    change the locking order for namespace_sem
    fix deadlock in pivot_root()
    vfs: split off vfsmount-related parts of vfs_kern_mount()
    Some fixes for pstore
    kill simple_set_mnt()

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
    omfs: make readdir stop when filldir says so
    omfs: merge unlink() and rmdir(), close leak in rename()
    omfs: stop playing silly buggers with omfs_unlink() in ->rename()
    omfs: rename() needs to mark old_inode dirty after ctime update

    Linus Torvalds
     
  • * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
    UBIFS: clean-up commentaries
    UBIFS: save 128KiB or more RAM
    UBIFS: allocate orphans scan buffer on demand
    UBIFS: allocate lpt dump buffer on demand
    UBIFS: allocate ltab checking buffer on demand
    UBIFS: allocate scanning buffer on demand
    UBIFS: allocate dump buffer on demand
    UBIFS: do not check data crc by default
    UBIFS: simplify UBIFS Kconfig menu
    UBIFS: print max. index node size
    UBIFS: handle allocation failures in UBIFS write path
    UBIFS: use max_write_size during recovery
    UBIFS: use max_write_size for write-buffers
    UBIFS: introduce write-buffer size field
    UBI: incorporate LEB offset information
    UBIFS: incorporate maximum write size
    UBI: provide LEB offset information
    UBI: incorporate maximum write size
    UBIFS: fix LEB number in printk
    UBIFS: restrict world-writable debugfs files
    ...

    Linus Torvalds
     
  • * 'linux-next' of git://git.infradead.org/ubi-2.6:
    UBI: make tests modes dynamic
    UBI: make self-checks dynamic
    UBI: make debugging messages dynamic
    UBI: remove UBI_IO_DEBUG macro
    UBI: kill debugging buffer
    UBI: allocate erase checking buffer on demand
    UBI: allocate write checking buffer on demand
    UBI: always re-read in case of read failures
    UBI: cleanup comments about corrupted PEBs
    UBI: add slab cache for ubi_scan_leb objects
    UBI: use raw mtd read function in debugging code
    UBI: try to reveal buggy MTD drivers
    UBI: add a commentary about allocating VID header buffer on stack
    UBI: cleanup LEB start calculations
    UBI: fix NOR erase preparation quirk

    Linus Torvalds
     
  • Add an entry for serial maintainers.

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

    Alan Cox
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
    ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
    ALSA: aloop - Fix possible IRQ lock inversion
    ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
    ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
    ALSA: firewire - msleep needs delay.h
    ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
    ALSA: firewire-lib: allocate DMA buffer separately
    ALSA: firewire-lib: use no-info SYT for packets without SYT sample
    ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
    ALSA: hda - Remove an unused variable in patch_realtek.c
    ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
    ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
    ALSA: hda - Move default input-src selection to init part
    ALSA: hda - Initialize special cases for input src in init phase
    ALSA: ctxfi - Clear input settings before initialization
    ALSA: ctxfi - Fix SPDIF status retrieval
    ALSA: ctxfi - Fix incorrect SPDIF status bit mask
    ALSA: ctxfi - Fix microphone boost codes/comments
    ALSA: atiixp - Fix wrong time-out checks during ac-link reset
    ALSA: intel8x0m: append 'm' to "r_intel8x0"
    ...

    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:
    x86: Flush TLB if PGD entry is changed in i386 PAE mode
    x86, dumpstack: Correct stack dump info when frame pointer is available
    x86: Clean up csum-copy_64.S a bit
    x86: Fix common misspellings
    x86: Fix misspelling and align params
    x86: Use PentiumPro-optimized partial_csum() on VIA C7

    Linus Torvalds
     
  • …rnel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    genirq: Fix incorrect unlock in __setup_irq()
    cris: Use generic show_interrupts()
    genirq: show_interrupts: Check desc->name before printing it blindly
    cris: Use accessor functions to set IRQ_PER_CPU flag
    cris: Fix irq conversion fallout

    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched, kernel-doc: Fix runqueue_is_locked() description

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

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
    trace, filters: Initialize the match variable in process_ops() properly
    trace, documentation: Fix branch profiling location in debugfs
    oprofile, s390: Cleanups
    oprofile, s390: Remove hwsampler_files.c and merge it into init.c
    perf: Fix tear-down of inherited group events
    perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
    perf: Handle stopped state with tracepoints
    perf: Fix the software events state check
    perf, powerpc: Handle events that raise an exception without overflowing
    perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
    perf, x86: Clean up SandyBridge PEBS events
    perf lock: Fix sorting by wait_min
    perf tools: Version incorrect with some versions of grep
    perf evlist: New command to list the names of events present in a perf.data file
    perf script: Add support for H/W and S/W events
    perf script: Add support for dumping symbols
    perf script: Support custom field selection for output
    perf script: Move printing of 'common' data from print_event and rename
    perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
    perf script: Change process_event prototype
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
    doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
    Update cpuset info & webiste for cgroups
    dcdbas: force SMI to happen when expected
    arch/arm/Kconfig: remove one to many l's in the word.
    asm-generic/user.h: Fix spelling in comment
    drm: fix printk typo 'sracth'
    Remove one to many n's in a word
    Documentation/filesystems/romfs.txt: fixing link to genromfs
    drivers:scsi Change printk typo initate -> initiate
    serial, pch uart: Remove duplicate inclusion of linux/pci.h header
    fs/eventpoll.c: fix spelling
    mm: Fix out-of-date comments which refers non-existent functions
    drm: Fix printk typo 'failled'
    coh901318.c: Change initate to initiate.
    mbox-db5500.c Change initate to initiate.
    edac: correct i82975x error-info reported
    edac: correct i82975x mci initialisation
    edac: correct commented info
    fs: update comments to point correct document
    target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
    ...

    Trivial conflict in fs/eventpoll.c (spelling vs addition)

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
    HID: add support for Logitech Driving Force Pro wheel
    HID: hid-ortek: remove spurious reference
    HID: add support for Ortek PKB-1700
    HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
    HID: hid-ntrig: init settle and mode check
    HID: merge hid-egalax into hid-multitouch
    HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
    HID: ntrig remove if and drop an indent
    HID: ACRUX - activate the device immediately after binding
    HID: ntrig: apply NO_INIT_REPORTS quirk
    HID: hid-magicmouse: Correct touch orientation direction
    HID: ntrig don't dereference unclaimed hidinput
    HID: Do not create input devices for feature reports
    HID: bt hidp: send Output reports using SET_REPORT on the Control channel
    HID: hid-sony.c: Fix sending Output reports to the Sixaxis
    HID: add support for Keytouch IEC 60945
    HID: Add HID Report Descriptor to sysfs
    HID: add IRTOUCH infrared USB to hid_have_special_driver
    HID: kernel oops in out_cleanup in function hidinput_connect
    HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
    ...

    Linus Torvalds
     
  • include/linux/dw_spi.h only includes driver internal data. It doesn't
    expose a platform_data configuration structure or similar (at least
    nothing in-tree). This patch moves the header into drivers/spi so
    that the scope is limited to only the dw_spi_*.c driver files

    Signed-off-by: Grant Likely
    Cc: Feng Tang
    Cc: spi-devel-general@lists.sourceforge.net

    Grant Likely
     

18 Mar, 2011

24 commits

  • Currently, build on PPC dies with:
    In file included from drivers/spi/dw_spi_mmio.c:16:
    include/linux/spi/dw_spi.h:147: error: field ‘tx_sgl’ has incomplete type
    include/linux/spi/dw_spi.h:149: error: field ‘rx_sgl’ has incomplete type

    Add linux/scatterlist.h include to dw_spi.h, because we need to know
    the contents of the structure.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Grant Likely

    Jiri Slaby
     
  • While trying to track down some NFS problems with BTRFS, I kept noticing I was
    getting -EACCESS for no apparent reason. Eric Paris and printk() helped me
    figure out that it was SELinux that was giving me grief, with the following
    denial

    type=AVC msg=audit(1290013638.413:95): avc: denied { 0x800000 } for pid=1772
    comm="nfsd" name="" dev=sda1 ino=256 scontext=system_u:system_r:kernel_t:s0
    tcontext=system_u:object_r:unlabeled_t:s0 tclass=file

    Turns out this is because in d_obtain_alias if we can't find an alias we create
    one and do all the normal instantiation stuff, but we don't do the
    security_d_instantiate.

    Usually we are protected from getting a hashed dentry that hasn't yet run
    security_d_instantiate() by the parent's i_mutex, but obviously this isn't an
    option there, so in order to deal with the case that a second thread comes in
    and finds our new dentry before we get to run security_d_instantiate(), we go
    ahead and call it if we find a dentry already. Eric assures me that this is ok
    as the code checks to see if the dentry has been initialized already so calling
    security_d_instantiate() against the same dentry multiple times is ok. With
    this patch I'm no longer getting errant -EACCESS values.

    Signed-off-by: Josef Bacik
    Signed-off-by: Al Viro

    Josef Bacik
     
  • it's always false...

    Signed-off-by: Al Viro

    Al Viro
     
  • Make sure the 'match' variable always has a value.

    Cc: Steven Rostedt
    Cc: Frederic Weisbecker
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits)
    powerpc/85xx: Fix signedness bug in cache-sram
    powerpc/fsl: 85xx: document cache sram bindings
    powerpc/fsl: define binding for fsl mpic interrupt controllers
    powerpc/fsl_msi: Handle msi-available-ranges better
    drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
    powerpc/85xx: Fix SPE float to integer conversion failure
    powerpc/85xx: Update sata controller compatible for p1022ds board
    ATA: Add FSL sata v2 controller support
    powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
    powerpc/8xx: remove obsolete mgsuvd board
    powerpc/82xx: rename and update mgcoge board support
    powerpc/83xx: rename and update kmeter1
    powerpc/85xx: Workaroudn e500 CPU erratum A005
    powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x
    powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
    powerpc/pseries: Disable MSI using new interface if possible
    powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.
    powerpc: core irq_data conversion.
    powerpc: sysdev/xilinx_intc irq_data conversion.
    powerpc: sysdev/uic irq_data conversion.
    ...

    Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of
    of_platform_driver in arch/powerpc)

    Linus Torvalds
     
  • it's always false now

    Signed-off-by: Al Viro

    Al Viro
     
  • Have it nested inside ->i_mutex. Instead of using follow_down()
    under namespace_sem, followed by grabbing i_mutex and checking that
    mountpoint to be is not dead, do the following:
    grab i_mutex
    check that it's not dead
    grab namespace_sem
    see if anything is mounted there
    if not, we've won
    otherwise
    drop locks
    put_path on what we had
    replace with what's mounted
    retry everything with new mountpoint to be

    New helper (lock_mount()) does that. do_add_mount(), do_move_mount(),
    do_loopback() and pivot_root() switched to it; in case of the last
    two that eliminates a race we used to have - original code didn't
    do follow_down().

    Signed-off-by: Al Viro

    Al Viro
     
  • Don't hold vfsmount_lock over the loop traversing ->mnt_parent;
    do check_mnt(new.mnt) under namespace_sem instead; combined with
    namespace_sem held over all that code it'll guarantee the stability
    of ->mnt_parent chain all the way to the root.

    Doing check_mnt() outside of namespace_sem in case of pivot_root()
    is wrong anyway.

    Signed-off-by: Al Viro

    Al Viro
     
  • According to intel CPU manual, every time PGD entry is changed in i386 PAE
    mode, we need do a full TLB flush. Current code follows this and there is
    comment for this too in the code.

    But current code misses the multi-threaded case. A changed page table
    might be used by several CPUs, every such CPU should flush TLB. Usually
    this isn't a problem, because we prepopulate all PGD entries at process
    fork. But when the process does munmap and follows new mmap, this issue
    will be triggered.

    When it happens, some CPUs keep doing page faults:

    http://marc.info/?l=linux-kernel&m=129915020508238&w=2

    Reported-by: Yasunori Goto
    Tested-by: Yasunori Goto
    Reviewed-by: Rik van Riel
    Signed-off-by: Shaohua Li
    Cc: Mallick Asit K
    Cc: Linus Torvalds
    Cc: Andrew Morton
    Cc: linux-mm
    Cc: stable
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Shaohua Li
     
  • Current stack dump code scans entire stack and check each entry
    contains a pointer to kernel code. If CONFIG_FRAME_POINTER=y it
    could mark whether the pointer is valid or not based on value of
    the frame pointer. Invalid entries could be preceded by '?' sign.

    However this was not going to happen because scan start point
    was always higher than the frame pointer so that they could not
    meet.

    Commit 9c0729dc8062 ("x86: Eliminate bp argument from the stack
    tracing routines") delayed bp acquisition point, so the bp was
    read in lower frame, thus all of the entries were marked
    invalid.

    This patch fixes this by reverting above commit while retaining
    stack_frame() helper as suggested by Frederic Weisbecker.

    End result looks like below:

    before:

    [ 3.508329] Call Trace:
    [ 3.508551] [] ? panic+0x91/0x199
    [ 3.508662] [] ? printk+0x68/0x6a
    [ 3.508770] [] ? mount_block_root+0x257/0x26e
    [ 3.508876] [] ? mount_root+0x56/0x5a
    [ 3.508975] [] ? prepare_namespace+0x170/0x1a9
    [ 3.509216] [] ? kernel_init+0x1d2/0x1e2
    [ 3.509335] [] ? kernel_thread_helper+0x4/0x10
    [ 3.509442] [] ? restore_args+0x0/0x30
    [ 3.509542] [] ? kernel_init+0x0/0x1e2
    [ 3.509641] [] ? kernel_thread_helper+0x0/0x10

    after:

    [ 3.522991] Call Trace:
    [ 3.523351] [] panic+0x91/0x199
    [ 3.523468] [] ? printk+0x68/0x6a
    [ 3.523576] [] mount_block_root+0x257/0x26e
    [ 3.523681] [] mount_root+0x56/0x5a
    [ 3.523780] [] prepare_namespace+0x170/0x1a9
    [ 3.523885] [] kernel_init+0x1d2/0x1e2
    [ 3.523987] [] kernel_thread_helper+0x4/0x10
    [ 3.524228] [] ? restore_args+0x0/0x30
    [ 3.524345] [] ? kernel_init+0x0/0x1e2
    [ 3.524445] [] ? kernel_thread_helper+0x0/0x10

    -v5:
    * fix build breakage with oprofile

    -v4:
    * use 0 instead of regs->bp
    * separate out printk changes

    -v3:
    * apply comment from Frederic
    * add a couple of printk fixes

    Signed-off-by: Namhyung Kim
    Acked-by: Peter Zijlstra
    Acked-by: Frederic Weisbecker
    Cc: Soren Sandmann
    Cc: Paul Mackerras
    Cc: Arnaldo Carvalho de Melo
    Cc: Robert Richter
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Namhyung Kim
     
  • The many stray whitespaces and other uncleanlinesses made this code
    almost unreadable to me - so fix those.

    No changes to the code.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • They were generated by 'codespell' and then manually reviewed.

    Signed-off-by: Lucas De Marchi
    Cc: trivial@kernel.org
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Lucas De Marchi
     
  • Fix 'upto' misspelling and align parameters.

    Signed-off-by: Lucas De Marchi
    Cc: trivial@kernel.org
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Lucas De Marchi
     
  • Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Takashi Iwai
     
  • The user-supplied index into the adapters array needs to be checked, or
    an out-of-bounds kernel pointer could be accessed and used, leading to
    potentially exploitable memory corruption.

    Signed-off-by: Dan Rosenberg
    Cc:
    Signed-off-by: Takashi Iwai

    Dan Rosenberg
     
  • loopback_pos_update() can be called in the timer callback, thus the lock
    held should be irq-safe. Otherwise you'll get AB/BA deadlock together
    with substream->self_group.lock.

    Reported-and-tested-by: Knut Petersen
    Cc:
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • I don't have the specs for this beast, but it looks a lot like the PXA
    GPIO block. Though I bet it's the same IP and the driver should have
    reused the PXA code.

    Acknowleding the edge detect status after handling one or more gpio
    interrupts looks wrong. We might lose an edge which came in while we
    handled the previous one.

    Signed-off-by: Thomas Gleixner
    Acked-by: Alek Du
    Signed-off-by: Grant Likely

    Thomas Gleixner
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits)
    arch/tile: support newer binutils assembler shift semantics
    arch/tile: fix deadlock bugs in rwlock implementation
    drivers/edac: provide support for tile architecture
    tile on-chip network driver: sync up with latest fixes
    arch/tile: support 4KB page size as well as 64KB
    arch/tile: add some more VMSPLIT options and use consistent naming
    arch/tile: fix some comments and whitespace
    arch/tile: export some additional module symbols
    arch/tile: enhance existing finv_buffer_remote() routine
    arch/tile: fix two bugs in the backtracer code
    arch/tile: use extended assembly to inline __mb_incoherent()
    arch/tile: use a cleaner technique to enable interrupt for cpu_idle()
    arch/tile: sync up with and changes
    arch/tile: fix reversed test of strict_strtol() return value
    arch/tile: avoid a simulator warning during bootup
    arch/tile: export to userspace
    arch/tile: warn and retry if an IPI is not accepted by the target cpu
    arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls
    arch/tile: fix __ndelay etc to work better
    arch/tile: bug fix: exec'ed task thought it was still single-stepping
    ...

    Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu
    alignment vs section naming convention fix)

    Linus Torvalds
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
    omap: zoom: host should not pull up wl1271's irq line
    arm: plat-omap: iommu: fix request_mem_region() error path
    OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
    omap4: mux: Remove duplicate mux modes
    omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
    omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
    omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
    omap4: board-omap4panda: Initialise the serial pads
    omap3: board-3430sdp: Initialise the serial pads
    omap4: board-4430sdp: Initialise the serial pads
    omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
    omap2+: mux: Remove the use of IDLE flag
    omap2+: Add separate list for dynamic pads to mux
    perf: add OMAP support for the new power events
    OMAP4: Add IVA OPP enteries.
    OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
    OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
    OMAP3+: OPP: Replace voltage values with Macros
    OMAP3: wdtimer: Fix CORE idle transition
    Watchdog: omap_wdt: add fine grain runtime-pm
    ...

    Fix up various conflicts in
    - arch/arm/mach-omap2/board-omap3evm.c
    - arch/arm/mach-omap2/clock3xxx_data.c
    - arch/arm/mach-omap2/usb-musb.c
    - arch/arm/plat-omap/include/plat/usb.h
    - drivers/usb/musb/musb_core.h

    Linus Torvalds
     
  • * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
    msm: scm: Check for interruption immediately
    msm: scm: Fix improper register assignment
    msm: scm: Mark inline asm as volatile
    msm: iommu: Enable HTW L2 redirection on MSM8960
    msm: iommu: Don't read from write-only registers
    msm: iommu: Remove dependency on IDR
    msm: iommu: Use ASID tagging instead of VMID tagging
    msm: iommu: Rework clock logic and add IOMMU bus clock control
    msm: iommu: Clock control for the IOMMU driver
    msm: mdp: Set the correct pack pattern for XRGB/ARGB
    msm_fb: Fix framebuffer console
    msm: mdp: Add support for RGBX 8888 image format.
    video: msmfb: Put the partial update magic value into the fix_screen struct.
    msm: clock: Migrate to clkdev
    msm: clock: Remove references to clk_ops_pcom
    msm: headsmp.S: Fix section mismatch
    msm: Use explicit GPLv2 licenses
    msm: iommu: Enable IOMMU support for MSM8960
    msm: iommu: Generalize platform data for multiple targets
    msm: iommu: Create a Kconfig item for the IOMMU driver
    ...

    Linus Torvalds
     
  • new function: mount_fs(). Does all work done by vfs_kern_mount()
    except the allocation and filling of vfsmount; returns root dentry
    or ERR_PTR().

    vfs_kern_mount() switched to using it and taken to fs/namespace.c,
    along with its wrappers.

    alloc_vfsmnt()/free_vfsmnt() made static.

    functions in namespace.c slightly reordered.

    Signed-off-by: Al Viro

    Al Viro
     
  • 1) Change from ->get_sb() to ->mount()
    2) Use mount_single() instead of mount_nodev()
    3) Pulled in ramfs_get_inode() & trimmed to what I need for pstore
    4) Drop the ugly pstore_writefile() Just save data using kmalloc() and
    provide a pstore_file_read() that uses simple_read_from_buffer().

    Signed-off-by: Al Viro

    Tony Luck
     
  • * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
    davinci: DM644x EVM: register MUSB device earlier
    davinci: add spi devices on tnetv107x evm
    davinci: add ssp config for tnetv107x evm board
    davinci: add tnetv107x ssp platform device
    spi: add ti-ssp spi master driver
    mfd: add driver for sequencer serial port
    ARM: EXYNOS4: Implement Clock gating for System MMU
    ARM: EXYNOS4: Enhancement of System MMU driver
    ARM: EXYNOS4: Add support for gpio interrupts
    ARM: S5P: Add function to register gpio interrupt bank data
    ARM: S5P: Cleanup S5P gpio interrupt code
    ARM: EXYNOS4: Add missing GPYx banks
    ARM: S3C64XX: Fix section mismatch from cpufreq init
    ARM: EXYNOS4: Add keypad device to the SMDKV310
    ARM: EXYNOS4: Update clocks for keypad
    ARM: EXYNOS4: Update keypad base address
    ARM: EXYNOS4: Add keypad device helpers
    ARM: EXYNOS4: Add support for SATA on ARMLEX4210
    plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
    mach-u300: define a dummy filter function for coh901318
    ...

    Fix up various conflicts in
    - arch/arm/mach-exynos4/cpufreq.c
    - arch/arm/mach-mxs/gpio.c
    - drivers/net/Kconfig
    - drivers/tty/serial/Kconfig
    - drivers/tty/serial/Makefile
    - drivers/usb/gadget/fsl_mxc_udc.c
    - drivers/video/Kconfig

    Linus Torvalds