Permalink
Commits on Jun 3, 2012
  1. USB/ppc4xx:Synopsys DWC OTG driver enable gadget support

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Enable gadget support
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  2. USB/ppc4xx: Add Synopsys DWC OTG driver kernel configuration and Make…

    Rupjyoti Sarmah committed with nomis May 3, 2012
    …file
    
    Add Synopsys DesignWare HS USB OTG driver kernel configuration.
    Synopsys OTG driver may operate in  host only, device only, or OTG mode.
    The driver also allows user configure the core to use its internal DMA
    or Slave (PIO) mode.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  3. USB/ppc4xx: Add Synopsys DWC OTG PCD interrupt function

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Implements the DWC OTG PCD Interrupt Service routine.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  4. USB/ppc4xx: Add Synopsys DWC OTG PCD function

    Rupjyoti Sarmah committed with nomis May 3, 2012
    The PCD is responsible for translating requests from the gadget driver
    to appropriate actions on the DWC OTG controller.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  5. USB/ppc4xx: Add Synopsys DWC OTG HCD queue function

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Implements functions to manage Queue Heads and Queue
    Transfer Descriptors of DWC USB OTG Controller.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  6. USB/ppc4xx: Add Synopsys DWC OTG HCD interrupt function

    Rupjyoti Sarmah committed with nomis May 3, 2012
    FImplements DWC OTG USB HCD interrupt service routine.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  7. USB/ppc4xx: Add Synopsys DWC OTG HCD function

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Implements DWC OTG USB Host Controller Driver (HCD) and interface to
    USB Host controller Driver framework.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  8. USB/ppc4xx: Add Synopsys DWC OTG Core Interface Layer (CIL)

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Core Interface Layer Common provides common functions for both host
    controller and peripheral controller.  CIL manages the memory map
    for the core. It also handles basic tasks like reading/writing the
    registers and data FIFOs in the controller. CIL performs basic
    services that are not specific to either the host or device modes
    of operation. These services include management of the OTG Host
    Negotiation Protocol (HNP) and Session Request Protocol (SRP).
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  9. USB/ppc4xx-Add-Synopsys-DWC-OTG-driver-framework

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Platform probing is in apmppc.c.
    Driver parameter and parameter checking are in param.c.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
  10. USB/ppc4xx: Add Synopsys DWC OTG Register definitions

    Rupjyoti Sarmah committed with nomis May 3, 2012
    Add Synopsys Design Ware core register definitions.
    
    Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com>
    Signed-off-by: Tirumala R Marri <tmarri@apm.com>
    Signed-off-by: Fushen Chen <fchen@apm.com>
    Signed-off-by: Mark Miesfeld <mmiesfeld@apm.com>
Commits on Jun 2, 2012
  1. bcm2835: reorganise irq handler

    nomis committed Jun 2, 2012
    Signed-off-by: Simon Arlott <sa.me.uk>
  2. bcm2708: reorganise irq handler

    nomis committed Jun 2, 2012
    Signed-off-by: Simon Arlott <sa.me.uk>
  3. Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Jun 2, 2012
    …rnel/git/viro/{vfs,signal}
    
    Pull vfs fix and a fix from the signal changes for frv from Al Viro.
    
    The __kernel_nlink_t for powerpc got scrogged because 64-bit powerpc
    actually depended on the default "unsigned long", while 32-bit powerpc
    had an explicit override to "unsigned short".  Al didn't notice, and
    made both of them be the unsigned short.
    
    The frv signal fix is fallout from simplifying the do_notify_resume()
    code, and leaving an extra parenthesis.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      powerpc: Fix size of st_nlink on 64bit
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
      frv: Remove bogus closing parenthesis
  4. powerpc: Fix size of st_nlink on 64bit

    antonblanchard committed with Al Viro Jun 2, 2012
    commit e57f93c (powerpc: get rid of nlink_t uses, switch to
    explicitly-sized type) changed the size of st_nlink on ppc64 from
    a long to a short, resulting in boot failures.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  5. frv: Remove bogus closing parenthesis

    geertu committed with Al Viro Jun 2, 2012
    Introduced by commit 6fd84c0
    ("TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set")
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  6. Merge branch 'akpm' (Fixups for Andrew's patchbomb)

    torvalds committed Jun 2, 2012
    Merge fixups for the mac NLS tables from Andrew.
    
    * emailed from Andrew Morton, and one cleanup by me:
      nls: fix (and rename) mac NLS table files and config options
      fs/nls/Makefile: remove bogus CONFIG_ assignments
  7. nls: fix (and rename) mac NLS table files and config options

    torvalds committed Jun 2, 2012
    The config options in the Kconfig file (with _CODEPAGE_ in the name)
    didn't match the config option name in the Makefile (no _CODEPAGE_).
    
    And both of them were of the hard-to-read MACXYZZY variety, which made
    them hard to parse for normal humans: MACROMAN easily reads as "macro
    man", not as "Mac Roman".
    
    So rename the options to be consistent, and be NLS_MAC_xyzzy.  Rename
    the files to be mac-xyzzy.c too, and drop the "nls" part entirely (it's
    already in the directory name).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. fs/nls/Makefile: remove bogus CONFIG_ assignments

    akpm00 committed with torvalds Jun 1, 2012
    These were debug things which snuck through.
    
    Reported-by: Yinghai Lu <yinghai@kernel.org>
    Cc: Vladimir Serbinenko <phcoder@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jun 1, 2012
  1. Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linu…

    torvalds committed Jun 1, 2012
    …x-2.6
    
    Pull fbdev updates from Florian Tobias Schandinat:
     - driver for AUO-K1900 and AUO-K1901 epaper controller
     - large updates for OMAP (e.g. decouple HDMI audio and video)
     - some updates for Exynos and SH Mobile
     - various other small fixes and cleanups
    
    * tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6: (130 commits)
      video: bfin_adv7393fb: Fix cleanup code
      video: exynos_dp: reduce delay time when configuring video setting
      video: exynos_dp: move sw reset prioir to enabling sw defined function
      video: exynos_dp: use devm_ functions
      fb: handle NULL pointers in framebuffer release
      OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request
      OMAPDSS: Apply VENC timings even if panel is disabled
      OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC
      OMAPDSS: DISPC: Support rotation through TILER
      OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
      OMAPFB: remove compiler warnings when CONFIG_BUG=n
      OMAPDSS: remove compiler warnings when CONFIG_BUG=n
      OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv
      OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays
      OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods
      OMAPDSS: DISPC: Update Accumulator configuration for chroma plane
      drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
      video: exynos mipi dsi: support reverse panel type
      video: exynos mipi dsi: Properly interpret the interrupt source flags
      video: exynos mipi dsi: Avoid races in probe()
      ...
  2. Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

    torvalds committed Jun 1, 2012
    Pull mtd update from David Woodhouse:
     - More robust parsing especially of xattr data in JFFS2
     - Updates to mxc_nand and gpmi drivers to support new boards and device tree
     - Improve consistency of information about ECC strength in NAND devices
     - Clean up partition handling of plat_nand
     - Support NAND drivers without dedicated access to OOB area
     - BCH hardware ECC support for OMAP
     - Other fixes and cleanups, and a few new device IDs
    
    Fixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to
    added include files next to each other.
    
    * tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits)
      mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
      mtd: block2mtd: fix recursive call of mtd_writev
      mtd: gpmi-nand: define ecc.strength
      mtd: of_parts: fix breakage in Kconfig
      mtd: nand: fix scan_read_raw_oob
      mtd: docg3 fix in-middle of blocks reads
      mtd: cfi_cmdset_0002: Slight cleanup of fixup messages
      mtd: add fixup for S29NS512P NOR flash.
      jffs2: allow to complete xattr integrity check on first GC scan
      jffs2: allow to discriminate between recoverable and non-recoverable errors
      mtd: nand: omap: add support for hardware BCH ecc
      ARM: OMAP3: gpmc: add BCH ecc api and modes
      mtd: nand: check the return code of 'read_oob/read_oob_raw'
      mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw'
      mtd: m25p80: Add support for Winbond W25Q80BW
      jffs2: get rid of jffs2_sync_super
      jffs2: remove unnecessary GC pass on sync
      jffs2: remove unnecessary GC pass on umount
      jffs2: remove lock_super
      mtd: gpmi: add gpmi support for mx6q
      ...
  3. Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers…

    torvalds committed Jun 1, 2012
    …-x86
    
    Pull x86 platform driver updates from Matthew Garrett:
     "Some significant improvements for the Sony driver on newer machines,
      but other than that mostly just minor fixes and a patch to remove the
      broken rfkill code from the Dell driver."
    
    * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (35 commits)
      apple-gmux: Fix up the suspend/resume patch
      dell-laptop: Remove rfkill code
      toshiba_acpi: Fix mis-merge
      dell-laptop: Add touchpad led support for Dell V3450
      acer-wmi: add 3 laptops to video backlight vendor mode quirk table
      sony-laptop: add touchpad enable/disable function
      sony-laptop: add missing Fn key combos for 0x100 handlers
      sony-laptop: add support for more WWAN modems
      sony-laptop: new keyboard backlight handle
      sony-laptop: add high speed battery charging function
      sony-laptop: support automatic resume on lid open
      sony-laptop: adjust error handling in finding SNC handles
      sony-laptop: add thermal profiles support
      sony-laptop: support battery care functions
      sony-laptop: additional debug statements
      sony-laptop: improve SNC initialization and acpi notify callback code
      sony-laptop: use kstrtoul to parse sysfs values
      sony-laptop: generalise ACPI calls into SNC functions
      sony-laptop: fix return path when no ACPI buffer is allocated
      sony-laptop: use soft rfkill status stored in hw
      ...
  4. Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed Jun 1, 2012
    …ernel/git/penberg/linux
    
    Pull slab updates from Pekka Enberg:
     "Mainly a bunch of SLUB fixes from Joonsoo Kim"
    
    * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
      slub: use __SetPageSlab function to set PG_slab flag
      slub: fix a memory leak in get_partial_node()
      slub: remove unused argument of init_kmem_cache_node()
      slub: fix a possible memory leak
      Documentations: Fix slabinfo.c directory in vm/slub.txt
      slub: fix incorrect return type of get_any_partial()
  5. Merge branch 'ux500/hickup' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds committed Jun 1, 2012
    …nel/git/arm/arm-soc
    
    Pull arm fixes for ux500 mismerge mishap from Arnd Bergmann:
     "The device tree conversion for arm/ux500 in 3.5 turns out to be
      incomplete because of a mismerge done by Linus Walleij that I failed
      to notice early enough and that Lee Jones as the original author of
      those patches did not manage to fix during the -next cycle.  While we
      originally to get a much larger set of ux500 device tree enablement
      patches merged, this did not happen in time.
    
      After some discussion at Linaro Connect conference this week, Lee has
      been able to do damage control and provide a series to put the broken
      platform back into usable shape for both DT and non-DT based booting.
    
      This series has not been part of linux-next and is based on top of the
      current state of the upstream kernel rather than an -rc, but this is
      the best we could manage given the earlier breakage."
    
    * 'ux500/hickup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: ux500: Enable probing of pinctrl through Device Tree
      ARM: ux500: Add support for ab8500 regulators into the Device Tree
      ARM: ux500: Provide regulator support for SMSC911x via Device Tree
      ARM: ux500: Allow PRCMU regulator to be probed during a DT enabled boot
      ARM: ux500: Apply db8500-prcmu regulator information to db8500 Device Tree
      ARM: ux500: Only initialise STE's UIBs on boards which support them
      ARM: ux500: Disable platform setup of the ab8500 when DT is enabled
      ARM: ux500: Use correct format for dynamic IRQ assignment
      ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots
      ARM: ux500: PRCMU related configuration and layout corrections for Device Tree
      ARM: ux500: Remove DB8500 PRCMU platform registration when DT is enabled
      ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
      ARM: ux500: New DT:ed u8500_init_devices for one-by-one device enablement
      ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement
      pinctrl-nomadik: Allow Device Tree driver probing
  6. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds committed Jun 1, 2012
    Pull drm fixes from Dave Airlie:
     "A bunch of fixes:
       - vmware memory corruption
       - ttm spinlock balance
       - cirrus/mgag200 work in the presence of efifb
      and finally Alex and Jerome managed to track down a magic set of bits
      that on certain rv740 and evergreen cards allow the correct use of the
      complete set of render backends, this makes the cards operate
      correctly in a number of scenarios we had issues in before, it also
      manages to boost speed on benchmarks my large amounts on these
      specific gpus."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/edid: Make the header fixup threshold tunable
      drm/radeon: fix regression in UMS CS ioctl
      drm/vmwgfx: Fix nasty write past alloced memory area
      drm/ttm: Fix spinlock imbalance
      drm/radeon: fixup tiling group size and backendmap on r6xx-r9xx (v4)
      drm/radeon: fix HD6790, HD6570 backend programming
      drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock
      drm/radeon: fix bank information in tiling config
      drm/mgag200: kick off conflicting framebuffers earlier.
      drm/cirrus: kick out conflicting framebuffers earlier
      cirrus: avoid crash if driver fails to load
  7. Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds committed Jun 1, 2012
    …t/tiwai/sound
    
    Pull sound fixes from Takashi Iwai:
     "Just a few trivial driver-specific fixes."
    
    * tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: hdspm - Work around broken DDS value on PCI RME MADI
      ALSA: usb-audio: fix rate_list memory leak
      ASoC: fsi: bugfix: ensure dma is terminated
      ASoC: fsi: bugfix: correct dma area
      ASoC: fsi: bugfix: enable master clock control on DMA stream
      ASoC: imx-ssi: Use clk_prepare_enable/clk_disable_unprepare
  8. mtd: mxc_nand: move ecc strengh setup before nand_scan_tail

    saschahauer committed with dwmw2 May 25, 2012
    Since commit 6a918ba, the mxc_nand driver
    fails with:
    
    Driver must set ecc.strength when using hardware ECC
    
    This is because nand_scan_tail checks for correct ecc strength
    settings, so we must set them up before nand_scan_tail.
    
    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: stable@vger.kernel.org [3.4+]
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  9. mtd: block2mtd: fix recursive call of mtd_writev

    juhosg committed with dwmw2 May 23, 2012
    The 'mtd_writev' interface calls the function assigned
    to the '_write' field of a given mtd device if that is
    not NULL. The block2mtd driver sets the '_writev' field
    to the 'mtd_writev' function itself and thus causes a
    endless loop.
    
    This is caused by 1dbebd3
    (mtd: harmonize mtd_writev usage).
    
    Remove the assignment from the block2mtd driver to fix the
    issue.
    
    Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
    Cc: stable@kernel.org [3.3+]
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  10. mtd: gpmi-nand: define ecc.strength

    Marek Vasut committed with dwmw2 May 21, 2012
    Fix an issue which was introduced by the recent addition of ecc.strength.
    
    The ecc.strength wasn't set in gpmi-nand, resulting in the following crash:
    [    2.550000] kernel BUG at drivers/mtd/nand/nand_base.c:3347!
    ...
    [    2.550000] [<c020841c>] (nand_scan_tail+0x328/0x650) from [<c02f68e0>] (gpmi_nand_probe+0x43c/0x5a4)
    [    2.550000] [<c02f68e0>] (gpmi_nand_probe+0x43c/0x5a4) from [<c01f6618>] (platform_drv_probe+0x14/0x18)
    [    2.550000] [<c01f6618>] (platform_drv_probe+0x14/0x18) from [<c01f55b0>] (driver_probe_device+0x74/0x1fc)
    [    2.550000] [<c01f55b0>] (driver_probe_device+0x74/0x1fc) from [<c01f57cc>] (__driver_attach+0x94/0x98)
    [    2.550000] [<c01f57cc>] (__driver_attach+0x94/0x98) from [<c01f3d40>] (bus_for_each_dev+0x50/0x80)
    [    2.550000] [<c01f3d40>] (bus_for_each_dev+0x50/0x80) from [<c01f4e18>] (bus_add_driver+0x188/0x25c)
    [    2.550000] [<c01f4e18>] (bus_add_driver+0x188/0x25c) from [<c01f5a70>] (driver_register+0x78/0x138)
    [    2.550000] [<c01f5a70>] (driver_register+0x78/0x138) from [<c043dc7c>] (gpmi_nand_init+0xc/0x30)
    [    2.550000] [<c043dc7c>] (gpmi_nand_init+0xc/0x30) from [<c0008824>] (do_one_initcall+0x108/0x17c)
    [    2.550000] [<c0008824>] (do_one_initcall+0x108/0x17c) from [<c042a8b8>] (kernel_init+0xfc/0x1bc)
    [    2.550000] [<c042a8b8>] (kernel_init+0xfc/0x1bc) from [<c000fab4>] (kernel_thread_exit+0x0/0x8)
    
    Signed-off-by: Marek Vasut <marex@denx.de>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  11. apple-gmux: Fix up the suspend/resume patch

    Matthew Garrett committed Jun 1, 2012
    I incorporated the wrong version of the suspend/resume patch for gmux,
    and so lost David Woodhouse's fix to leave the backlight level unchanged
    over suspend/resume. This fixes it up to v2.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
  12. mtd: of_parts: fix breakage in Kconfig

    fsvend committed with dwmw2 May 17, 2012
    MTD_OF_PARTS and the default setting is not working due to using 'Y'
    instead of 'y', introduced in commit
    d6137ba. This made our board, and
    possibly other boards using DTS defined partitions and not having
    CONFIG_MTD_OF_PARTS=y defined in the defconfig, fail to mount root.
    
    Signed-off-by: Frank Svendsboe <frank.svendsboe@gmail.com>
    Cc: stable@kernel.org [3.2+]
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  13. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jun 1, 2012
    …/git/viro/signal
    
    Pull third pile of signal handling patches from Al Viro:
     "This time it's mostly helpers and conversions to them; there's a lot
      of stuff remaining in the tree, but that'll either go in -rc2
      (isolated bug fixes, ideally via arch maintainers' trees) or will sit
      there until the next cycle."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
      x86: get rid of calling do_notify_resume() when returning to kernel mode
      blackfin: check __get_user() return value
      whack-a-mole with TIF_FREEZE
      FRV: Optimise the system call exit path in entry.S [ver #2]
      FRV: Shrink TIF_WORK_MASK [ver #2]
      FRV: Prevent syscall exit tracing and notify_resume at end of kernel exceptions
      new helper: signal_delivered()
      powerpc: get rid of restore_sigmask()
      most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set
      set_restore_sigmask() is never called without SIGPENDING (and never should be)
      TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set
      don't call try_to_freeze() from do_signal()
      pull clearing RESTORE_SIGMASK into block_sigmask()
      sh64: failure to build sigframe != signal without handler
      openrisc: tracehook_signal_handler() is supposed to be called on success
      new helper: sigmask_to_save()
      new helper: restore_saved_sigmask()
      new helpers: {clear,test,test_and_clear}_restore_sigmask()
      HAVE_RESTORE_SIGMASK is defined on all architectures now
  14. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jun 1, 2012
    …/git/viro/vfs
    
    Pull vfs changes from Al Viro.
     "A lot of misc stuff.  The obvious groups:
       * Miklos' atomic_open series; kills the damn abuse of
         ->d_revalidate() by NFS, which was the major stumbling block for
         all work in that area.
       * ripping security_file_mmap() and dealing with deadlocks in the
         area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in
         general.
       * ->encode_fh() switched to saner API; insane fake dentry in
         mm/cleancache.c gone.
       * assorted annotations in fs (endianness, __user)
       * parts of Artem's ->s_dirty work (jff2 and reiserfs parts)
       * ->update_time() work from Josef.
       * other bits and pieces all over the place.
    
      Normally it would've been in two or three pull requests, but
      signal.git stuff had eaten a lot of time during this cycle ;-/"
    
    Fix up trivial conflicts in Documentation/filesystems/vfs.txt (the
    'truncate_range' inode method was removed by the VM changes, the VFS
    update adds an 'update_time()' method), and in fs/btrfs/ulist.[ch] (due
    to sparse fix added twice, with other changes nearby).
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (95 commits)
      nfs: don't open in ->d_revalidate
      vfs: retry last component if opening stale dentry
      vfs: nameidata_to_filp(): don't throw away file on error
      vfs: nameidata_to_filp(): inline __dentry_open()
      vfs: do_dentry_open(): don't put filp
      vfs: split __dentry_open()
      vfs: do_last() common post lookup
      vfs: do_last(): add audit_inode before open
      vfs: do_last(): only return EISDIR for O_CREAT
      vfs: do_last(): check LOOKUP_DIRECTORY
      vfs: do_last(): make ENOENT exit RCU safe
      vfs: make follow_link check RCU safe
      vfs: do_last(): use inode variable
      vfs: do_last(): inline walk_component()
      vfs: do_last(): make exit RCU safe
      vfs: split do_lookup()
      Btrfs: move over to use ->update_time
      fs: introduce inode operation ->update_time
      reiserfs: get rid of resierfs_sync_super
      reiserfs: mark the superblock as dirty a bit later
      ...
  15. Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds committed Jun 1, 2012
    …el/git/tytso/ext4
    
    Pull Ext4 updates from Theodore Ts'o:
     "The major new feature added in this update is Darrick J Wong's
      metadata checksum feature, which adds crc32 checksums to ext4's
      metadata fields.
    
      There is also the usual set of cleanups and bug fixes."
    
    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
      ext4: hole-punch use truncate_pagecache_range
      jbd2: use kmem_cache_zalloc wrapper instead of flag
      ext4: remove mb_groups before tearing down the buddy_cache
      ext4: add ext4_mb_unload_buddy in the error path
      ext4: don't trash state flags in EXT4_IOC_SETFLAGS
      ext4: let getattr report the right blocks in delalloc+bigalloc
      ext4: add missing save_error_info() to ext4_error()
      ext4: add debugging trigger for ext4_error()
      ext4: protect group inode free counting with group lock
      ext4: use consistent ssize_t type in ext4_file_write()
      ext4: fix format flag in ext4_ext_binsearch_idx()
      ext4: cleanup in ext4_discard_allocated_blocks()
      ext4: return ENOMEM when mounts fail due to lack of memory
      ext4: remove redundundant "(char *) bh->b_data" casts
      ext4: disallow hard-linked directory in ext4_lookup
      ext4: fix potential integer overflow in alloc_flex_gd()
      ext4: remove needs_recovery in ext4_mb_init()
      ext4: force ro mount if ext4_setup_super() fails
      ext4: fix potential NULL dereference in ext4_free_inodes_counts()
      ext4/jbd2: add metadata checksumming to the list of supported features
      ...