Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 2, 2012
  1. Linux 3.6-rc1

    authored
  2. Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/l…

    authored
    …inux-olpc
    
    Pull OLPC platform updates from Andres Salomon:
     "These move the OLPC Embedded Controller driver out of
      arch/x86/platform and into drivers/platform/olpc.
    
      OLPC machines are now ARM-based (which means lots of x86 and ARM
      changes), but are typically pretty self-contained..  so it makes more
      sense to go through a separate OLPC tree after getting the appropriate
      review/ACKs."
    
    * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc:
      x86: OLPC: move s/r-related EC cmds to EC driver
      Platform: OLPC: move global variables into priv struct
      Platform: OLPC: move debugfs support from x86 EC driver
      x86: OLPC: switch over to using new EC driver on x86
      Platform: OLPC: add a suspended flag to the EC driver
      Platform: OLPC: turn EC driver into a platform_driver
      Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it
      drivers: OLPC: update various drivers to include olpc-ec.h
      Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver
  3. Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/…

    authored
    …arm-soc
    
    Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
     "This contains a set of device-tree conversions for Marvell Orion
      platforms that were staged early but took a few tries to get the
      branch into a format where it was suitable for us to pick up.
    
      Given that most people working on these platforms are hobbyists with
      limited time, we were a bit more flexible with merging it even though
      it came in late."
    
    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
      ARM: Kirkwood: Replace mrvl with marvell
      ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
      ARM: Kirkwood: Describe Dreamplug LEDs in DT.
      ARM: Kirkwood: Describe iConnects LEDs in DT.
      ARM: Kirkwood: Describe iConnects temperature sensor in DT.
      ARM: Kirkwood: Describe IB62x0 LEDs in DT.
      ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
      ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
      ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
      ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
      ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
      ARM: Kirkwood: Use DT to configure SATA device.
      ARM: kirkwood: use devicetree for SPI on dreamplug
      ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
      ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
      ARM: Kirkwood: Add basic device tree support for QNAP TS219.
      ATA: sata_mv: Add device tree support
      ARM: Orion: DTify the watchdog timer.
      ARM: Orion: Add arch support needed for I2C via DT.
      ARM: kirkwood: use devicetree for orion-spi
      ...
    
    Conflicts:
    	drivers/watchdog/orion_wdt.c
  4. Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/…

    authored
    …arm-soc
    
    Pull arm-soc cpuidle enablement for OMAP from Olof Johansson:
     "Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree,
      but didn't go in because the pull request ended up rejected.  So it
      just got merged, and we got this staged branch that enables the
      coupled cpuidle code on OMAP.
    
      With a stable git workflow from the other maintainer we could have
      staged this earlier, but that wasn't the case so we have had to merge
      it late.
    
      The alternative is to hold it off until 3.7 but given that the code is
      well-isolated to OMAP and they are eager to see it go in, I didn't
      push back hard in that direction."
    
    * tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: OMAP4: CPUidle: Open broadcast clock-event device.
      ARM: OMAP4: CPUidle: add synchronization for coupled idle states
      ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
      ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
  5. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/arm/arm-soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "A few fixes for merge window fallout, and a bugfix for timer resume on
      PRIMA2."
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: mmp: add missing irqs.h
      arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs
      ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
      ARM: mxc: Include missing irqs.h header
  6. Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

    authored
    Pull SuperH fixes from Paul Mundt.
    
    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (24 commits)
      sh: explicitly include sh_dma.h in setup-sh7722.c
      sh: ecovec: care CN5 VBUS if USB host mode
      sh: sh7724: fixup renesas_usbhs clock settings
      sh: intc: initial irqdomain support.
      sh: pfc: Fix up init ordering mess.
      serial: sh-sci: fix compilation breakage, when DMA is enabled
      dmaengine: shdma: restore partial transfer calculation
      sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
      sh: Fix up recursive fault in oops with unset TTB.
      sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
      sh: select the fixed regulator driver on several boards
      sh: ecovec: switch MMC power control to regulators
      sh: add fixed voltage regulators to se7724
      sh: add fixed voltage regulators to sdk7786
      sh: add fixed voltage regulators to rsk
      sh: add fixed voltage regulators to migor
      sh: add fixed voltage regulators to kfr2r09
      sh: add fixed voltage regulators to ap325rxa
      sh: add fixed voltage regulators to sh7757lcr
      sh: add fixed voltage regulators to sh2007
      ...
  7. Merge tag 'md-3.6' of git://neil.brown.name/md

    authored
    Pull additional md update from NeilBrown:
     "This contains a few patches that depend on plugging changes in the
      block layer so needed to wait for those.
    
      It also contains a Kconfig fix for the new RAID10 support in dm-raid."
    
    * tag 'md-3.6' of git://neil.brown.name/md:
      md/dm-raid: DM_RAID should select MD_RAID10
      md/raid1: submit IO from originating thread instead of md thread.
      raid5: raid5d handle stripe in batch way
      raid5: make_request use batch stripe release
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/sage/ceph-client
    
    Pull two ceph fixes from Sage Weil:
     "The first patch fixes up the old crufty open intent code to use the
      atomic_open stuff properly, and the second fixes a possible null deref
      and memory leak with the crypto keys."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      libceph: fix crypto key null deref, memory leak
      ceph: simplify+fix atomic_open
  9. Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/li…

    authored
    …nux/kernel/git/tyhicks/ecryptfs
    
    Pull ecryptfs fixes from Tyler Hicks:
     - Fixes a bug when the lower filesystem mount options include 'acl',
       but the eCryptfs mount options do not
     - Cleanups in the messaging code
     - Better handling of empty files in the lower filesystem to improve
       usability.  Failed file creations are now cleaned up and empty lower
       files are converted into eCryptfs during open().
     - The write-through cache changes are being reverted due to bugs that
       are not easy to fix.  Stability outweighs the performance
       enhancements here.
     - Improvement to the mount code to catch unsupported ciphers specified
       in the mount options
    
    * tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
      eCryptfs: check for eCryptfs cipher support at mount
      eCryptfs: Revert to a writethrough cache model
      eCryptfs: Initialize empty lower files when opening them
      eCryptfs: Unlink lower inode when ecryptfs_create() fails
      eCryptfs: Make all miscdev functions use daemon ptr in file private_data
      eCryptfs: Remove unused messaging declarations and function
      eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
  10. Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

    authored
    Pull CIFS update from Steve French:
     "Adds SMB2 rmdir/mkdir capability to the SMB2/SMB2.1 support in cifs.
    
      I am holding up a few more days on merging the remainder of the
      SMB2/SMB2.1 enablement although it is nearing review completion, in
      order to address some review comments from Jeff Layton on a few of the
      subsequent SMB2 patches, and also to debug an unrelated cifs problem
      that Pavel discovered."
    
    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
      CIFS: Add SMB2 support for rmdir
      CIFS: Move rmdir code to ops struct
      CIFS: Add SMB2 support for mkdir operation
      CIFS: Separate protocol specific part from mkdir
      CIFS: Simplify cifs_mkdir call
  11. mm: remove node_start_pfn checking in new WARN_ON for now

    authored
    Borislav Petkov reports that the new warning added in commit
    88fdf75 ("mm: warn if pg_data_t isn't initialized with zero")
    triggers for him, and it is the node_start_pfn field that has already
    been initialized once.
    
    The call trace looks like this:
    
      x86_64_start_kernel ->
        x86_64_start_reservations ->
        start_kernel ->
        setup_arch ->
        paging_init ->
        zone_sizes_init ->
        free_area_init_nodes ->
        free_area_init_node
    
    and (with the warning replaced by debug output), Borislav sees
    
      On node 0 totalpages: 4193848
        DMA zone: 64 pages used for memmap
        DMA zone: 6 pages reserved
        DMA zone: 3890 pages, LIFO batch:0
        DMA32 zone: 16320 pages used for memmap
        DMA32 zone: 798464 pages, LIFO batch:31
        Normal zone: 52736 pages used for memmap
        Normal zone: 3322368 pages, LIFO batch:31
      free_area_init_node: pgdat->node_start_pfn: 4423680      <----
      On node 1 totalpages: 4194304
        Normal zone: 65536 pages used for memmap
        Normal zone: 4128768 pages, LIFO batch:31
      free_area_init_node: pgdat->node_start_pfn: 8617984      <----
      On node 2 totalpages: 4194304
        Normal zone: 65536 pages used for memmap
        Normal zone: 4128768 pages, LIFO batch:31
      free_area_init_node: pgdat->node_start_pfn: 12812288     <----
      On node 3 totalpages: 4194304
        Normal zone: 65536 pages used for memmap
        Normal zone: 4128768 pages, LIFO batch:31
    
    so remove the bogus warning for now to avoid annoying people.  Minchan
    Kim is looking at it.
    
    Reported-by: Borislav Petkov <bp@amd64.org>
    Cc: Minchan Kim <minchan@kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @hzhuang1 @olofj

    ARM: mmp: add missing irqs.h

    hzhuang1 authored olofj committed
    arch/arm/mach-mmp/gplugd.c:195:13: error: ‘MMP_NR_IRQS’ undeclared here
    (not in a function)
    make[1]: *** [arch/arm/mach-mmp/gplugd.o] Error 1
    
    Include <mach/irqs.h> to fix this issue.
    
    Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  13. @tpetazzoni @olofj

    arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs

    tpetazzoni authored olofj committed
    The comment was wrongly referring to Armada 370 while the file is
    related to Armada XP.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  14. @21cnbao @olofj

    ARM: PRIMA2: delete redundant codes to restore LATCHED when timer res…

    21cnbao authored olofj committed
    …umes
    
    The only way to write LATCHED registers to write LATCH_BIT to LATCH register,
    that will latch COUNTER into LATCHED.e.g.
    writel_relaxed(SIRFSOC_TIMER_LATCH_BIT, sirfsoc_timer_base +
    	SIRFSOC_TIMER_LATCH);
    
    Writing values to LATCHED registers directly is useless at all.
    
    Signed-off-by: Barry Song <Baohua.Song@csr.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  15. @smunaut @liewegas

    libceph: fix crypto key null deref, memory leak

    smunaut authored liewegas committed
    Avoid crashing if the crypto key payload was NULL, as when it was not correctly
    allocated and initialized.  Also, avoid leaking it.
    
    Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
    Signed-off-by: Sage Weil <sage@inktank.com>
    Reviewed-by: Alex Elder <elder@inktank.com>
  16. @liewegas

    ceph: simplify+fix atomic_open

    liewegas authored
    The initial ->atomic_open op was carried over from the old intent code,
    which was incomplete and didn't really work.  Replace it with a fresh
    method.  In particular:
    
     * always attempt to do an atomic open+lookup, both for the create case
       and for lookups of existing files.
     * fix symlink handling by returning 1 to the VFS so that we can follow
       the link to its destination. This fixes a longstanding ceph bug (#2392).
    
    Signed-off-by: Sage Weil <sage@inktank.com>
  17. @lyakh @pmundt

    sh: explicitly include sh_dma.h in setup-sh7722.c

    lyakh authored pmundt committed
    setup-sh7722.c defines several objects, whose types are defined in
    sh_dma.h, so, it has to be included explicitly.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Commits on Aug 1, 2012
  1. Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…

    authored
    …ream-linus
    
    Pull MIPS updates from Ralf Baechle:
     "The lion share of this pull request are fixes for clk-related breakage
      caused by other changes during this merge window.  For some platforms
      the fix was as simple as selecting HAVE_CLK, for others like the
      Loongson 2 significant restructuring was required.
    
      The remainder are changes required to get the Lantiq code to work
      again."
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
      MIPS: Loongson 2: Sort out clock managment.
      MIPS: Loongson 1: more clk support and add select HAVE_CLK
      MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLK
      MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLK
      MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLK
      MIPS: Lantiq: Platform specific CLK fixup
      MIPS: Lantiq: Add device_tree_init function
      MIPS: Lantiq: Fix interface clock and PCI control register offset
  2. Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linu…

    authored
    …x/kernel/git/rw/uml
    
    Pull UML fixes from Richard Weinberger:
     "This patch set contains mostly fixes and cleanups.  The UML tty driver
      uses now tty_port and is no longer broken like hell  :-)"
    
    * 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
      um: Add arch/x86/um to MAINTAINERS
      um: pass siginfo to guest process
      um: fix ubd_file_size for read-only files
      um: pull interrupt_end() into userspace()
      um: split syscall_trace(), pass pt_regs to it
      um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs
      um: set BLK_CGROUP=y in defconfig
      um: remove count_lock
      um: fully use tty_port
      um: Remove dead code
      um: remove line_ioctl()
      TTY: um/line, use tty from tty_port
      TTY: um/line, add tty_port
  3. Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm

    authored
    Pull ARM DMA engine updates from Russell King:
     "This looks scary at first glance, but what it is is:
       - a rework of the sa11x0 DMA engine driver merged during the previous
         cycle, to extract a common set of helper functions for DMA engine
         implementations.
       - conversion of amba-pl08x.c to use these helper functions.
       - addition of OMAP DMA engine driver (using these helper functions),
         and conversion of some of the OMAP DMA users to use DMA engine.
    
      Nothing in the helper functions is ARM specific, so I hope that other
      implementations can consolidate some of their code by making use of
      these helpers.
    
      This has been sitting in linux-next most of the merge cycle, and has
      been tested by several OMAP folk.  I've tested it on sa11x0 platforms,
      and given it my best shot on my broken platforms which have the
      amba-pl08x controller.
    
      The last point is the addition to feature-removal-schedule.txt, which
      will have a merge conflict.  Between myself and TI, we're planning to
      remove the old TI DMA implementation next year."
    
    Fix up trivial add/add conflicts in Documentation/feature-removal-schedule.txt
    and drivers/dma/{Kconfig,Makefile}
    
    * 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm: (53 commits)
      ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engine
      ARM: 7464/1: mmc: omap_hsmmc: ensure probe returns error if DMA channel request fails
      Add feature removal of old OMAP private DMA implementation
      mtd: omap2: remove private DMA API implementation
      mtd: omap2: add DMA engine support
      spi: omap2-mcspi: remove private DMA API implementation
      spi: omap2-mcspi: add DMA engine support
      ARM: omap: remove mmc platform data dma_mask and initialization
      mmc: omap: remove private DMA API implementation
      mmc: omap: add DMA engine support
      mmc: omap_hsmmc: remove private DMA API implementation
      mmc: omap_hsmmc: add DMA engine support
      dmaengine: omap: add support for cyclic DMA
      dmaengine: omap: add support for setting fi
      dmaengine: omap: add support for returning residue in tx_state method
      dmaengine: add OMAP DMA engine driver
      dmaengine: sa11x0-dma: add cyclic DMA support
      dmaengine: sa11x0-dma: fix DMA residue support
      dmaengine: PL08x: ensure all descriptors are freed when channel is released
      dmaengine: PL08x: get rid of write only pool_ctr and free_txd locking
      ...
  4. Merge branch 'audit' of git://git.linaro.org/people/rmk/linux-arm

    authored
    Pull ARM audit/signal updates from Russell King:
     "ARM audit/signal handling updates from Al and Will.  This improves on
      the work Viro did last merge window, and sorts out some of the issues
      found with that work."
    
    * 'audit' of git://git.linaro.org/people/rmk/linux-arm:
      ARM: 7475/1: sys_trace: allow all syscall arguments to be updated via ptrace
      ARM: 7474/1: get rid of TIF_SYSCALL_RESTARTSYS
      ARM: 7473/1: deal with handlerless restarts without leaving the kernel
      ARM: 7472/1: pull all work_pending logics into C function
      ARM: 7471/1: Revert "7442/1: Revert "remove unused restart trampoline""
      ARM: 7470/1: Revert "7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK""
  5. Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    authored
    Pull ARM fixes from Russell King:
     "This fixes various issues found during July"
    
    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
      ARM: 7479/1: mm: avoid NULL dereference when flushing gate_vma with VIVT caches
      ARM: Fix undefined instruction exception handling
      ARM: 7480/1: only call smp_send_stop() on SMP
      ARM: 7478/1: errata: extend workaround for erratum #720789
      ARM: 7477/1: vfp: Always save VFP state in vfp_pm_suspend on UP
      ARM: 7476/1: vfp: only clear vfp state for current cpu in vfp_pm_suspend
      ARM: 7468/1: ftrace: Trace function entry before updating index
      ARM: 7467/1: mutex: use generic xchg-based implementation for ARMv6+
      ARM: 7466/1: disable interrupt before spinning endlessly
      ARM: 7465/1: Handle >4GB memory sizes in device tree and mem=size@start option
  6. @richardweinberger

    um: Add arch/x86/um to MAINTAINERS

    richardweinberger authored
    Signed-off-by: Richard Weinberger <richard@nod.at>
  7. @mpartel @richardweinberger

    um: pass siginfo to guest process

    mpartel authored richardweinberger committed
    UML guest processes now get correct siginfo_t for SIGTRAP, SIGFPE,
    SIGILL and SIGBUS. Specifically, si_addr and si_code are now correct
    where previously they were si_addr = NULL and si_code = 128.
    
    Signed-off-by: Martin Pärtel <martin.partel@gmail.com>
    Signed-off-by: Richard Weinberger <richard@nod.at>
  8. @mpartel @richardweinberger

    um: fix ubd_file_size for read-only files

    mpartel authored richardweinberger committed
    Made ubd_file_size not request write access. Fixes use of read-only images.
    
    Signed-off-by: Martin Pärtel <martin.partel@gmail.com>
    Signed-off-by: Richard Weinberger <richard@nod.at>
  9. @neilbrown

    md/dm-raid: DM_RAID should select MD_RAID10

    neilbrown authored
    Now that DM_RAID supports raid10, it needs to select that code
    to ensure it is included.
    
    Cc: Jonathan Brassow <jbrassow@redhat.com>
    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
  10. @neilbrown

    md/raid1: submit IO from originating thread instead of md thread.

    neilbrown authored
    queuing writes to the md thread means that all requests go through the
    one processor which may not be able to keep up with very high request
    rates.
    
    So use the plugging infrastructure to submit all requests on unplug.
    If a 'schedule' is needed, we fall back on the old approach of handing
    the requests to the thread for it to handle.
    
    Signed-off-by: NeilBrown <neilb@suse.de>
  11. @neilbrown

    raid5: raid5d handle stripe in batch way

    Shaohua Li authored neilbrown committed
    Let raid5d handle stripe in batch way to reduce conf->device_lock locking.
    
    Signed-off-by: Shaohua Li <shli@fusionio.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
  12. @neilbrown

    raid5: make_request use batch stripe release

    Shaohua Li authored neilbrown committed
    make_request() does stripe release for every stripe and the stripe usually has
    count 1, which makes previous release_stripe() optimization not work. In my
    test, this release_stripe() becomes the heaviest pleace to take
    conf->device_lock after previous patches applied.
    
    Below patch makes stripe release batch. All the stripes will be released in
    unplug. The STRIPE_ON_UNPLUG_LIST bit is to protect concurrent access stripe
    lru.
    
    Signed-off-by: Shaohua Li <shli@fusionio.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
  13. @richardweinberger

    um: pull interrupt_end() into userspace()

    Al Viro authored richardweinberger committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Richard Weinberger <richard@nod.at>
  14. @richardweinberger

    um: split syscall_trace(), pass pt_regs to it

    Al Viro authored richardweinberger committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    [richard@nod.at: Fixed some minor build issues]
    Signed-off-by: Richard Weinberger <richard@nod.at>
  15. @richardweinberger

    um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs

    Al Viro authored richardweinberger committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Richard Weinberger <richard@nod.at>
  16. Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linu…

    authored
    …x-2.6
    
    Pull fbdev updates from Florian Tobias Schandinat:
     - large updates for OMAP
       - support for LCD3 overlay manager (omap5)
       - omapdss output cleanup
       - removal of passive matrix LCD support as there are no drivers for
         such panels for DSS or DSS2 and nobody complained (cleanup)
     - large updates for SH Mobile
       - overlay support
       - separating MERAM (cache) from framebuffer driver
     - some updates for Exynos and da8xx-fb
     - various other small patches
    
    * tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6: (78 commits)
      da8xx-fb: fix compile issue due to missing include
      fbdev: Make pixel_to_pat() failure mode more friendly
      da8xx-fb: do not turn ON LCD backlight unless LCDC is enabled
      fbdev: sh_mobile_lcdc: Fix vertical panning step
      video: exynos mipi dsi: Fix mipi dsi regulators handling issue
      video: da8xx-fb: do clock reset of revision 2 LCDC before enabling
      arm: da850: configure LCDC fifo threshold
      video: da8xx-fb: configure FIFO threshold to reduce underflow errors
      video: da8xx-fb: fix flicker due to 1 frame delay in updated frame
      video: da8xx-fb rev2: fix disabling of palette completion interrupt
      da8xx-fb: add missing FB_BLANK operations
      video: exynos_dp: use usleep_range instead of delay
      video: exynos_dp: check the only INTERLANE_ALIGN_DONE bit during Link Training
      fb: epson1355fb: Fix section mismatch
      video: exynos_dp: fix wrong DPCD address during Link Training
      video/smscufx: fix line counting in fb_write
      aty128fb: Fix coding style issues
      fbdev: sh_mobile_lcdc: Fix pan offset computation in YUV mode
      fbdev: sh_mobile_lcdc: Fix overlay registers update during pan operation
      fbdev: sh_mobile_lcdc: Support horizontal panning
      ...
  17. Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    authored
    …t/tiwai/sound
    
    Pull sound fixes from Takashi Iwai:
     "A collection of small fixes that have been found recently.  Most of
      the commits are regression fixes in HD-audio and some other random
      drivers."
    
    * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: snd-usb: fix clock source validity index
      ALSA: hda - Fix mute-LED GPIO initialization for IDT codecs
      ALSA: hda - Add descriptions for missing IDT 92HD83x models
      ALSA: hda - Fix polarity of mute LED on HP Mini 210
      ALSA: es1688 - freeup resources on init failure
      ALSA: hda - Workaround for silent output on VAIO Z with ALC889
      ALSA: hda - Fix WARNING from HDMI/DP parser
      ALSA: hda - Detach from converter at closing in patch_hdmi.c
      ALSA: hda - Fix mute-LED GPIO setup for HP Mini 210
      ALSA: mpu401: Fix missing initialization of irq field
      ALSA: hda - Fix invalid D3 of headphone DAC on VT202x codecs
  18. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/viro/vfs
    
    Pull second vfs pile from Al Viro:
     "The stuff in there: fsfreeze deadlock fixes by Jan (essentially, the
      deadlock reproduced by xfstests 068), symlink and hardlink restriction
      patches, plus assorted cleanups and fixes.
    
      Note that another fsfreeze deadlock (emergency thaw one) is *not*
      dealt with - the series by Fernando conflicts a lot with Jan's, breaks
      userland ABI (FIFREEZE semantics gets changed) and trades the deadlock
      for massive vfsmount leak; this is going to be handled next cycle.
      There probably will be another pull request, but that stuff won't be
      in it."
    
    Fix up trivial conflicts due to unrelated changes next to each other in
    drivers/{staging/gdm72xx/usb_boot.c, usb/gadget/storage_common.c}
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (54 commits)
      delousing target_core_file a bit
      Documentation: Correct s_umount state for freeze_fs/unfreeze_fs
      fs: Remove old freezing mechanism
      ext2: Implement freezing
      btrfs: Convert to new freezing mechanism
      nilfs2: Convert to new freezing mechanism
      ntfs: Convert to new freezing mechanism
      fuse: Convert to new freezing mechanism
      gfs2: Convert to new freezing mechanism
      ocfs2: Convert to new freezing mechanism
      xfs: Convert to new freezing code
      ext4: Convert to new freezing mechanism
      fs: Protect write paths by sb_start_write - sb_end_write
      fs: Skip atime update on frozen filesystem
      fs: Add freezing handling to mnt_want_write() / mnt_drop_write()
      fs: Improve filesystem freezing handling
      switch the protection of percpu_counter list to spinlock
      nfsd: Push mnt_want_write() outside of i_mutex
      btrfs: Push mnt_want_write() outside of i_mutex
      fat: Push mnt_want_write() outside of i_mutex
      ...
Something went wrong with that request. Please try again.