1. 30 Mar, 2012 22 commits
    • Lucas De Marchi's avatar
      Documentation: remove references to /etc/modprobe.conf · 970e2486
      Lucas De Marchi authored
      Usage of /etc/modprobe.conf file was deprecated by module-init-tools and
      is no longer parsed by new kmod tool. References to this file are
      replaced in Documentation, comments and Kconfig according to the
      There are also some references to the old /etc/modules.conf from 2.4
      kernels that are being removed.
      Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
      Acked-by: Takashi Iwai's avatarTakashi Iwai <tiwai@suse.de>
      Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Randy Dunlap's avatar
      Documentation: input.txt: clarify mousedev 'cat' command syntax · 09601523
      Randy Dunlap authored
      Clarify that the 'cat' command does not include the (c, 13, 32)
      after it.
      Reported-by: 積丹尼 Dan Jacobson's avatarDan Jidanni Jacobson <jidanni@jidanni.org>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Josh Triplett's avatar
    • Randy Dunlap's avatar
    • Javi Merino's avatar
      Documentation: mention scripts/diffconfig tool · 673d29f9
      Javi Merino authored
      The kconfig documentation suggests using plain 'diff' to compare config
      files and then adds "Yes, we need something better here".  Commit
      a717417e ("kconfig: add diffconfig utility") added what that comment
      was looking for.
      Signed-off-by: default avatarJavi Merino <javi.merino@arm.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • H Hartley Sweeten's avatar
      Documentation: remove 'mach' from dontdiff file · f52a7593
      H Hartley Sweeten authored
      The mach entry in the dontdiff file causes all the
      arch/arm/mach-*/include/mach directories to be skipped.
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh · f52b69f8
      Linus Torvalds authored
      Pull SuperH updates from Paul Mundt.
      * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (25 commits)
        sh: Support I/O space swapping where needed.
        sh: use set_current_blocked() and block_sigmask()
        sh: no need to reset handler if SA_ONESHOT
        sh: intc: Fix up section mismatch for intc_ack_data
        sh: select ARCH_DISCARD_MEMBLOCK.
        sh: Consolidate duplicate _32/_64 unistd definitions.
        sh: ecovec: switch SDHI controllers to card polling
        sh: Avoid exporting unimplemented syscalls.
        sh: add platform_device for RSPI in setup-sh7757
        SH: pci-sh7780: enable big-endian operation.
        serial: sh-sci: fix a race of DMA submit_tx on transfer
        sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
        sh: dma: Collect up CHCR of SH7723 and SH7730
        sh/next: Fix build fail by asm/system.h in asm/bitops.h
        arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible
        sh: cpufreq: Wire up scaling_available_freqs support.
        sh: cpufreq: notify about rate rounding fallback.
        sh: cpufreq: Support CPU clock frequency table.
        sh: cpufreq: struct device lookup from CPU topology.
        sh: cpufreq: percpu struct clk accounting.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 2f7fa1be
      Linus Torvalds authored
      Pull 2nd round of input updates from Dmitry Torokhov:
       - update to Wacom driver to support wireless devices
       - update to Sentelci touchpad driver to support newer hardware
       - update to gpio-keys driver to support "interrupt-only" keys
       - fixups to earlier commits
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - check for allocation failure in probe()
        Input: tegra-kbc - allocate pdata before using it
        Input: amijoy - add missing platform check
        Input: wacom - wireless battery status
        Input: wacom - create inputs when wireless connect
        Input: wacom - wireless monitor framework
        Input: wacom - isolate input registration
        Input: sentelic - improve packet debugging information
        Input: sentelic - minor code cleanup
        Input: sentelic - enabling absolute coordinates output for newer hardware
        Input: sentelic - refactor code for upcoming new hardware support
        Input: gpio_keys - add support for interrupt only keys
        Input: gpio_keys - consolidate key destructor code
        Input: revert "gpio_keys - switch to using threaded IRQs"
        Input: gpio_keys - constify platform data
        Input: spear-keyboard - remove kbd_set_plat_data()
    • Dan Carpenter's avatar
      Input: wacom - check for allocation failure in probe() · f1823940
      Dan Carpenter authored
      We accidentally removed the check for NULL in 3aac0ef1 "Input: wacom -
      isolate input registration".
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Reviewed-by: default avatarChris Bagwell <chris@cnpbagwell.com>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
    • Linus Torvalds's avatar
      Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 13386314
      Linus Torvalds authored
      Pull urgent cgroup fix from Tejun Heo:
       "Commit 61d1d219 ('cgroup: remove extra calls to
        find_existing_css_set') which was part of the rc1 cgroup pull request
        made writes to the cgroup "tasks" file return an uninitialized retval
        on success which can cause boot failures with systemd.
        The change stayed in linux-next for quite some time but gcc
        interestingly failed to emit warning about using uninitialized
        variable and the problem seems to materialize only for certain build
        combinations (probably depends on register allocation).
        It's just missing local variable initialization and the fix is trivial
        & safe.  As the problem is critical when it materializes, I'm
        fast-tracking it.  Also included is Li's email address change in
      * 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: cgroup_attach_task() could return -errno after success
        cgroup: update MAINTAINERS entry
    • Tejun Heo's avatar
      cgroup: cgroup_attach_task() could return -errno after success · 8f121918
      Tejun Heo authored
      61d1d219 "cgroup: remove extra calls to find_existing_css_set" made
      cgroup_task_migrate() return void.  An unfortunate side effect was
      that cgroup_attach_task() was depending on that function's return
      value to clear its @retval on the success path.  On cgroup mounts
      without any subsystem with ->can_attach() callback,
      cgroup_attach_task() ended up returning @retval without initializing
      it on success.
      For some reason, gcc failed to warn about it and it didn't cause
      cgroup_attach_task() to return non-zero value in many cases, probably
      due to difference in register allocation.  When the problem
      materializes, systemd fails to populate /systemd cgroup mount and
      fails to boot.
      Fix it by initializing @retval to zero on declaration.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarJiri Kosina <jkosina@suse.cz>
      LKML-Reference: <alpine.LNX.2.00.1203282354440.25526@pobox.suse.cz>
      Reviewed-by: default avatarMandeep Singh Baines <msb@chromium.org>
      Acked-by: default avatarLi Zefan <lizefan@huawei.com>
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4bde23f8
      Linus Torvalds authored
      Pull arm-soc fixes from Olof Johansson:
       "This is a first pass of some of the merge window fallout for ARM
        Nothing controversial:
         - A system.h fallout fix for OMAP
         - PXA fixes for breakage caused by the regulator struct changes
         - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
         - A mismerge in our arm-soc tree of an lpc32xx change for networking
         - A fix for USB setup on tegra
         - An undo of __init annotation of display mux setup on OMAP that's
           needed at runtime"
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: pxa: fix build issue on stargate2
        ARM: pxa: fix build issue on cm-x300
        ARM: pxa: fix build failure for regulator consumer in em-x270.c
        ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
        ARM: OMAP: pm: fix compilation break
        ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
        drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
        ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
        ARM: pxa: fix regulator related build fail in magician_defconfig
        ARM: tegra: Fix device tree AUXDATA for USB/EHCI
        ARM: OMAP2+: Remove __init from DSI mux functions
    • Olof Johansson's avatar
      Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes · f00e9b11
      Olof Johansson authored
      * 'fixes' of git://github.com/hzhuang1/linux:
        ARM: pxa: fix build issue on stargate2
        ARM: pxa: fix build issue on cm-x300
        ARM: pxa: fix build failure for regulator consumer in em-x270.c
        ARM: pxa: fix regulator related build fail in magician_defconfig
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · e152c38a
      Linus Torvalds authored
      Pull devicetree documentation update from Grant Likely.
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        dt: Linux DT usage model documentation
        mtd: Move fdt partition documentation to a seperate file
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · eb05df9e
      Linus Torvalds authored
      Pull x86 cleanups from Peter Anvin:
       "The biggest textual change is the cleanup to use symbolic constants
        for x86 trap values.
        The only *functional* change and the reason for the x86/x32 dependency
        is the move of is_ia32_task() into <asm/thread_info.h> so that it can
        be used in other code that needs to understand if a system call comes
        from the compat entry point (and therefore uses i386 system call
        numbers) or not.  One intended user for that is the BPF system call
        filter.  Moving it out of <asm/compat.h> means we can define it
        unconditionally, returning always true on i386."
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h
        x86: Rename trap_no to trap_nr in thread_struct
        x86: Use enum instead of literals for trap values
    • Grant Likely's avatar
      dt: Linux DT usage model documentation · 31134efc
      Grant Likely authored
      v2: 2nd draft
       - Editorial cleanups (Randy Dunlap and Stephen Warren)
       - Added missing Microblaze reference (Stephen Neuendorffer)
       - Make example of platform_device creation clearer (Shawn Guo)
       - Expand on PowerPC history and mention i2c mess (David Gibson)
       - convert to plain text (remove bits of html formating)
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
    • Linus Torvalds's avatar
      Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a591afc0
      Linus Torvalds authored
      Pull x32 support for x86-64 from Ingo Molnar:
       "This tree introduces the X32 binary format and execution mode for x86:
        32-bit data space binaries using 64-bit instructions and 64-bit kernel
        This allows applications whose working set fits into a 32 bits address
        space to make use of 64-bit instructions while using a 32-bit address
        space with shorter pointers, more compressed data structures, etc."
      Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}
      * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
        x32: Fix alignment fail in struct compat_siginfo
        x32: Fix stupid ia32/x32 inversion in the siginfo format
        x32: Add ptrace for x32
        x32: Switch to a 64-bit clock_t
        x32: Provide separate is_ia32_task() and is_x32_task() predicates
        x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
        x86/x32: Fix the binutils auto-detect
        x32: Warn and disable rather than error if binutils too old
        x32: Only clear TIF_X32 flag once
        x32: Make sure TS_COMPAT is cleared for x32 tasks
        fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
        fs: Fix close_on_exec pointer in alloc_fdtable
        x32: Drop non-__vdso weak symbols from the x32 VDSO
        x32: Fix coding style violations in the x32 VDSO code
        x32: Add x32 VDSO support
        x32: Allow x32 to be configured
        x32: If configured, add x32 system calls to system call tables
        x32: Handle process creation
        x32: Signal-related system calls
        x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h>
    • Haojian Zhuang's avatar
      ARM: pxa: fix build issue on stargate2 · 5616131d
      Haojian Zhuang authored
      arch/arm/mach-pxa/stargate2.c:155:3: error: unknown field ‘dev’
      specified in initializer
      arch/arm/mach-pxa/stargate2.c:155:3: warning: initialization from
      incompatible pointer type [enabled by default]
      arch/arm/mach-pxa/stargate2.c:155:3: warning: (near initialization for
      ‘stargate2_sensor_3_con[0].dev_name’) [enabled by default]
      make[1]: *** [arch/arm/mach-pxa/stargate2.o] Error 1
      make: *** [arch/arm/mach-pxa] Error 2
      It's caused by 'dev' field removed from struct
      Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
    • Haojian Zhuang's avatar
      ARM: pxa: fix build issue on cm-x300 · e9478587
      Haojian Zhuang authored
      arch/arm/mach-pxa/cm-x300.c:716:3: error: unknown field ‘dev’ specified
      in initializer
      make[1]: *** [arch/arm/mach-pxa/cm-x300.o] Error 1
      make: *** [arch/arm/mach-pxa] Error 2
      It's caused by 'dev' field removed from struct
      Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
    • Linus Torvalds's avatar
      Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 820d41cf
      Linus Torvalds authored
      Pull "ARM: cleanups of io includes" from Olof Johansson:
       "Rob Herring has done a sweeping change cleaning up all of the
        mach/io.h includes, moving some of the oft-repeated macros to a common
        location and removing a bunch of boiler plate.  This is another step
        closer to a common zImage for multiple platforms."
      Fix up various fairly trivial conflicts (<mach/io.h> removal vs changes
      around it, tegra localtimer.o is *still* gone, yadda-yadda).
      * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
        ARM: tegra: Include assembler.h in sleep.S to fix build break
        ARM: pxa: use common IOMEM definition
        ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
        ARM: __io abuse cleanup
        ARM: create a common IOMEM definition
        ARM: iop13xx: fix missing declaration of iop13xx_init_early
        ARM: fix ioremap/iounmap for !CONFIG_MMU
        ARM: kill off __mem_pci
        ARM: remove bunch of now unused mach/io.h files
        ARM: make mach/io.h include optional
        ARM: clps711x: remove unneeded include of mach/io.h
        ARM: dove: add explicit include of dove.h to addr-map.c
        ARM: at91: add explicit include of hardware.h to uncompressor
        ARM: ep93xx: clean-up mach/io.h
        ARM: tegra: clean-up mach/io.h
        ARM: orion5x: clean-up mach/io.h
        ARM: davinci: remove unneeded mach/io.h include
        [media] davinci: remove includes of mach/io.h
        ARM: OMAP: Remove remaining includes for mach/io.h
        ARM: msm: clean-up mach/io.h
    • Paul Gortmaker's avatar
      ARM: pxa: fix build failure for regulator consumer in em-x270.c · 804d2312
      Paul Gortmaker authored
      Commit 737f360d
      "regulator: Remove support for supplies specified by struct device"
      caused this file to break, since it was still relying on the
      device field to be present.  Map it onto dev_name appropriately
      Since there are two consumers with the name "reg-userspace-consumer",
      we have to supply the ID as a suffix in the REGULATOR_CONSUMER calls.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
    • Linus Torvalds's avatar
      Revert "ext4: don't release page refs in ext4_end_bio()" · 6268b325
      Linus Torvalds authored
      This reverts commit b43d17f3.
      Dave Jones reports that it causes lockups on his laptop, and his debug
      output showed a lot of processes hung waiting for page_writeback (or
      more commonly - processes hung waiting for a lock that was held during
      that writeback wait).
      The page_writeback hint made Ted suggest that Dave look at this commit,
      and Dave verified that reverting it makes his problems go away.
      Ted says:
       "That commit fixes a race which is seen when you write into fallocated
        (and hence uninitialized) disk blocks under *very* heavy memory
        pressure.  Furthermore, although theoretically it could trigger under
        normal direct I/O writes, it only seems to trigger if you are issuing
        a huge number of AIO writes, such that a just-written page can get
        evicted from memory, and then read back into memory, before the
        workqueue has a chance to update the extent tree.
        This race has been around for a little over a year, and no one noticed
        until two months ago; it only happens under fairly exotic conditions,
        and in fact even after trying very hard to create a simple repro under
        lab conditions, we could only reproduce the problem and confirm the
        fix on production servers running MySQL on very fast PCIe-attached
        flash devices.
        Given that Dave was able to hit this problem pretty quickly, if we
        confirm that this commit is at fault, the only reasonable thing to do
        is to revert it IMO."
      Reported-and-tested-by: default avatarDave Jones <davej@redhat.com>
      Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  2. 29 Mar, 2012 18 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 12679a2d
      Linus Torvalds authored
      Pull more ARM updates from Russell King.
      This got a fair number of conflicts with the <asm/system.h> split, but
      also with some other sparse-irq and header file include cleanups.  They
      all looked pretty trivial, though.
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits)
        ARM: fix Kconfig warning for HAVE_BPF_JIT
        ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds
        ARM: 7349/1: integrator: convert to sparse irqs
        ARM: 7259/3: net: JIT compiler for packet filters
        ARM: 7334/1: add jump label support
        ARM: 7333/2: jump label: detect %c support for ARM
        ARM: 7338/1: add support for early console output via semihosting
        ARM: use set_current_blocked() and block_sigmask()
        ARM: exec: remove redundant set_fs(USER_DS)
        ARM: 7332/1: extract out code patch function from kprobes
        ARM: 7331/1: extract out insn generation code from ftrace
        ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format
        ARM: 7351/1: ftrace: remove useless memory checks
        ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path
        ARM: Versatile Express: add NO_IOPORT
        ARM: get rid of asm/irq.h in asm/prom.h
        ARM: 7319/1: Print debug info for SIGBUS in user faults
        ARM: 7318/1: gic: refactor irq_start assignment
        ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop
        ARM: 7315/1: perf: add support for the Cortex-A7 PMU
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils · 1c036588
      Linus Torvalds authored
      Pull cpupower updates from Dominik Brodowski.
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
        cpupower tools: add install target to the debug tools' makefiles
        cpupower tools: allow to build debug tools in a separate directory too
        cpupower: Fix broken mask values
        cpupower tool: allow to build in a separate directory
        cpupower tool: makefile: simplify the recipe used to generate cpupower.pot target
        cpupower tool: remove use of undefined variables from the clean target of the top makefile
        cpupower: Fix linking with --as-needed
        cpupower: Remove unneeded code and by that fix a memleak
        cpupower: Fix number of idle states
        cpupower: Unify cpupower-frequency-* manpages
        cpupower: Add cpupower-idle-info manpage
        cpupower: AMD fam14h/Ontario monitor can also be used by fam12h cpus
        cpupower: Better interface for accessing AMD pci registers
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia · a6f707b6
      Linus Torvalds authored
      Pull a few PCMCIA updates from Dominik Brodowski.
      Fix up trivial conflict (modified code in question had been removed) in
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
        pcmcia at91_cf: fix raw gpio number usage
        ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
        pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
        pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
        pcmcia: irq: Remove IRQF_DISABLED
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · ef08e782
      Linus Torvalds authored
      Pull slave-dmaengine update from Vinod Koul:
       "This includes the cookie cleanup by Russell, the addition of context
        parameter for dmaengine APIs, more arm dmaengine driver cleanup by
        moving code to dmaengine, this time for imx by Javier and pl330 by
        Boojin along with the usual driver fixes."
      Fix up some fairly trivial conflicts with various other cleanups.
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
        dmaengine: imx: fix the build failure on x86_64
        dmaengine: i.MX: Fix merge of cookie branch.
        dmaengine: i.MX: Add support for interleaved transfers.
        dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
        dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
        dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
        dmaengine: imx-dma: remove internal structure.
        dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
        dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
        dmaengine: imx-dma: remove sg member from internal structure.
        dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
        dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
        dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
        dmaengine: imx-dma: remove dma_mode member of internal structure.
        dmaengine: imx-dma: remove data member from internal structure.
        dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
        dmaengine: at_hdmac: add slave config operation
        dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
        dmaengine/dma_slave: introduce inline wrappers
        dma: imx-sdma: Treat firmware messages as warnings instead of erros
    • Linus Torvalds's avatar
      Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux · 71db34fc
      Linus Torvalds authored
      Pull nfsd changes from Bruce Fields:
       - Benny Halevy and Tigran Mkrtchyan implemented some more 4.1 features,
         moving us closer to a complete 4.1 implementation.
       - Bernd Schubert fixed a long-standing problem with readdir cookies on
       - Jeff Layton performed a long-overdue overhaul of the server reboot
         recovery code which will allow us to deprecate the current code (a
         rather unusual user of the vfs), and give us some needed flexibility
         for further improvements.
       - Like the client, we now support numeric uid's and gid's in the
         auth_sys case, allowing easier upgrades from NFSv2/v3 to v4.x.
      Plus miscellaneous bugfixes and cleanup.
      Thanks to everyone!
      There are also some delegation fixes waiting on vfs review that I
      suppose will have to wait for 3.5.  With that done I think we'll finally
      turn off the "EXPERIMENTAL" dependency for v4 (though that's mostly
      symbolic as it's been on by default in distro's for a while).
      And the list of 4.1 todo's should be achievable for 3.5 as well:
      though we may still want a bit more experience with it before turning it
      on by default.
      * 'for-3.4' of git://linux-nfs.org/~bfields/linux: (55 commits)
        nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled
        nfsd4: use auth_unix unconditionally on backchannel
        nfsd: fix NULL pointer dereference in cld_pipe_downcall
        nfsd4: memory corruption in numeric_name_to_id()
        sunrpc: skip portmap calls on sessions backchannel
        nfsd4: allow numeric idmapping
        nfsd: don't allow legacy client tracker init for anything but init_net
        nfsd: add notifier to handle mount/unmount of rpc_pipefs sb
        nfsd: add the infrastructure to handle the cld upcall
        nfsd: add a header describing upcall to nfsdcld
        nfsd: add a per-net-namespace struct for nfsd
        sunrpc: create nfsd dir in rpc_pipefs
        nfsd: add nfsd4_client_tracking_ops struct and a way to set it
        nfsd: convert nfs4_client->cl_cb_flags to a generic flags field
        NFSD: Fix nfs4_verifier memory alignment
        NFSD: Fix warnings when NFSD_DEBUG is not defined
        nfsd: vfs_llseek() with 32 or 64 bit offsets (hashes)
        nfsd: rename 'int access' to 'int may_flags' in nfsd_open()
        ext4: return 32/64-bit dir name hash according to usage type
        fs: add new FMODE flags: FMODE_32bithash and FMODE_64bithash
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 50483c32
      Linus Torvalds authored
      Pull arch/tile (really asm-generic) update from Chris Metcalf:
       "These are a couple of asm-generic changes that apply to tile."
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        compat: use sys_sendfile64() implementation for sendfile syscall
        [PATCH v3] ipc: provide generic compat versions of IPC syscalls
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7fda0412
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar.
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        cpusets: Remove an unused variable
        sched/rt: Improve pick_next_highest_task_rt()
        sched: Fix select_fallback_rq() vs cpu_active/cpu_online
        sched/x86/smp: Do not enable IRQs over calibrate_delay()
        sched: Fix compiler warning about declared inline after use
        MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6b8212a3
      Linus Torvalds authored
      Pull x86 updates from Ingo Molnar.
      This touches some non-x86 files due to the sanitized INLINE_SPIN_UNLOCK
      config usage.
      Fixed up trivial conflicts due to just header include changes (removing
      headers due to cpu_idle() merge clashing with the <asm/system.h> split).
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic/amd: Be more verbose about LVT offset assignments
        x86, tls: Off by one limit check
        x86/ioapic: Add io_apic_ops driver layer to allow interception
        x86/olpc: Add debugfs interface for EC commands
        x86: Merge the x86_32 and x86_64 cpu_idle() functions
        x86/kconfig: Remove CONFIG_TR=y from the defconfigs
        x86: Stop recursive fault in print_context_stack after stack overflow
        x86/io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y
        x86/apic: Add separate apic_id_valid() functions for selected apic drivers
        locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
        x86/kconfig: Update defconfigs
        x86: Fix excessive MSR print out when show_msr is not specified
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bcd55074
      Linus Torvalds authored
      Pull timer core updates from Thomas Gleixner.
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ia64: vsyscall: Add missing paranthesis
        alarmtimer: Don't call rtc_timer_init() when CONFIG_RTC_CLASS=n
        x86: vdso: Put declaration before code
        x86-64: Inline vdso clock_gettime helpers
        x86-64: Simplify and optimize vdso clock_gettime monotonic variants
        kernel-time: fix s/then/than/ spelling errors
        time: remove no_sync_cmos_clock
        time: Avoid scary backtraces when warning of > 11% adj
        alarmtimer: Make sure we initialize the rtctimer
        ntp: Fix leap-second hrtimer livelock
        x86, tsc: Skip refined tsc calibration on systems with reliable TSC
        rtc: Provide flag for rtc devices that don't support UIE
        ia64: vsyscall: Use seqcount instead of seqlock
        x86: vdso: Use seqcount instead of seqlock
        x86: vdso: Remove bogus locking in update_vsyscall_tz()
        time: Remove bogus comments
        time: Fix change_clocksource locking
        time: x86: Fix race switching from vsyscall to non-vsyscall clock
    • Luck, Tony's avatar
      Fix ia64 build errors (fallout from system.h disintegration) · 93f37888
      Luck, Tony authored
      Fix this build error on ia64:
        In file included from include/linux/sched.h:92,
                        from arch/ia64/kernel/asm-offsets.c:9:
        include/linux/llist.h:59:25: error: asm/cmpxchg.h: No such file or directory
        make[1]: *** [arch/ia64/kernel/asm-offsets.s] Error 1
      Right now we don't seem to need any actual contents for the
      asm/cmpxchg.h to make the build work ...  so leave the migration of
      xchg() and cmpxchg() to this new header file for a future patch.
      Also process.c needs <asm/switch_to.h> (for definition of pfm_syst_info).
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6 · 55a32030
      Linus Torvalds authored
      Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely.
      That code had been moved into generic irqdomain code, but still had
      powerpc-specific code and could only be enabled on powerpc.
      * 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6:
        irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename
        irqdomain: Remove powerpc dependency from debugfs file
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Andrew's patch-bomb) · 18a06efa
      Linus Torvalds authored
      Single fix for a commit from the first batch of patches through Andrew.
      * emailed from Andrew Morton <akpm@linux-foundation.org>:
        pagemap: remove remaining unneeded spin_lock()
    • Naoya Horiguchi's avatar
      pagemap: remove remaining unneeded spin_lock() · 10bdfb5e
      Naoya Horiguchi authored
      Commit 025c5b24 ("thp: optimize away unnecessary page table
      locking") moves spin_lock() into pmd_trans_huge_lock() in order to avoid
      locking unless pmd is for thp.  So this spin_lock() is a bug.
      Reported-by: default avatarSasha Levin <levinsasha928@gmail.com>
      Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Grant Likely's avatar
    • Grant Likely's avatar
      irqdomain: Remove powerpc dependency from debugfs file · 092b2fb0
      Grant Likely authored
      The debugfs code is really generic for all platforms.  This patch removes the
      powerpc-specific directory reference and makes it available to all
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
    • Olof Johansson's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes · a92e7023
      Olof Johansson authored
      From Tony Lindgren:
      "This contains the updated gpio_to_irq patches from Tarun, and a trivial
      build fix from Govindraj to #include <asm/system_misc.h> in pm.c.
      The DSI mux patch is the same."
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP: pm: fix compilation break
        ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
        drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
        ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
        ARM: OMAP2+: Remove __init from DSI mux functions
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 0a03726c
      Linus Torvalds authored
      Pull the intel i915 hibernation memory corruption fix from Dave Airlie:
       "I tracked down the misc memory corruption after i915 hibernate to the
        blinking fbcon cursor, and realised the i915 driver wasn't doing the
        fbdev suspend/resume calls at all.  nouveau and radeon have done these
        calls for a long time.
        This has been fairly well tested and is definitely the main culprit in
        hibernate not working."
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: suspend fbdev device around suspend/hibernate
    • Olof Johansson's avatar
      Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of... · a99ab888
      Olof Johansson authored
      Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
      * 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ARM: tegra: Fix device tree AUXDATA for USB/EHCI