12 Sep, 2013

9 commits

  • Fix mistake in the description of Committed_AS in kernel documentation.

    Signed-off-by: Minto Joseph
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Minto Joseph
     
  • Add a new %P variable to be used in core_pattern. This variable contains
    the global PID (PID in the init namespace) as %p contains the PID in the
    current namespace which isn't always what we want.

    The main use for this is to make it easier to handle crashes that happened
    within a container. With that new variables it's possible to have the
    crashes dumped into the container or forwarded to the host with the right
    PID (from the host's point of view).

    Signed-off-by: Stéphane Graber
    Reported-by: Hans Feldt
    Cc: Alexander Viro
    Cc: Eric W. Biederman
    Cc: Andy Whitcroft
    Acked-by: Serge E. Hallyn
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stéphane Graber
     
  • Palmas series device like TPS65913, TPS80036 supports the backup battery
    for powering the RTC when no other energy source is available.

    The backup battery is optional, connected to the VBACKUP pin, and can be
    nonrechargeable or rechargeable. The rechargeable battery can be charged
    from the system supply using the backup battery charger.

    Add support for enabling charging of this backup battery. Also add the DT
    binding document and the new properties to have this support.

    Signed-off-by: Laxman Dewangan
    Reviewed-by: Felipe Balbi
    Acked-by: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Laxman Dewangan
     
  • On some platforms (like AM33xx), a special register (RTC_IRQWAKEEN) is
    available to enable Alarm Wakeup feature. This register needs to be
    properly handled for the rtcwake to work properly.

    Platforms using such IP should set "ti,am3352-rtc" in rtc device dt
    compatibility node.

    Signed-off-by: Hebbar Gururaja
    Acked-by: Kevin Hilman
    Acked-by: Sekhar Nori
    Cc: Grant Likely
    Cc: Rob Herring
    Cc: Rob Landley
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hebbar Gururaja
     
  • Add RTC driver for MOXA ART SoCs.

    Signed-off-by: Jonas Jensen
    Reviewed-by: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jonas Jensen
     
  • Pavel reported that in case if vma area get unmapped and then mapped (or
    expanded) in-place, the soft dirty tracker won't be able to recognize this
    situation since it works on pte level and ptes are get zapped on unmap,
    loosing soft dirty bit of course.

    So to resolve this situation we need to track actions on vma level, there
    VM_SOFTDIRTY flag comes in. When new vma area created (or old expanded)
    we set this bit, and keep it here until application calls for clearing
    soft dirty bit.

    Thus when user space application track memory changes now it can detect if
    vma area is renewed.

    Reported-by: Pavel Emelyanov
    Signed-off-by: Cyrill Gorcunov
    Cc: Andy Lutomirski
    Cc: Matt Mackall
    Cc: Xiao Guangrong
    Cc: Marcelo Tosatti
    Cc: KOSAKI Motohiro
    Cc: Stephen Rothwell
    Cc: Peter Zijlstra
    Cc: "Aneesh Kumar K.V"
    Cc: Rob Landley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov
     
  • Now hugepage migration is enabled, although restricted on pmd-based
    hugepages for now (due to lack of testing.) So we should allocate
    migratable hugepages from ZONE_MOVABLE if possible.

    This patch makes GFP flags in hugepage allocation dependent on migration
    support, not only the value of hugepages_treat_as_movable. It provides no
    change on the behavior for architectures which do not support hugepage
    migration,

    Signed-off-by: Naoya Horiguchi
    Acked-by: Andi Kleen
    Reviewed-by: Wanpeng Li
    Cc: Hillf Danton
    Cc: Mel Gorman
    Cc: Hugh Dickins
    Cc: KOSAKI Motohiro
    Cc: Michal Hocko
    Cc: Rik van Riel
    Cc: "Aneesh Kumar K.V"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Naoya Horiguchi
     
  • Explicitly mention/recommend using the libhugetlbfs test cases when
    changing related kernel code. Developers that are unaware of the project
    can easily miss this and introduce potential regressions that may or may
    not be caught by community review.

    Also do some cleanups that make the document visually easier to view at a
    first glance.

    Signed-off-by: Davidlohr Bueso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Read block device partition table from command line. The partition used
    for fixed block device (eMMC) embedded device. It is no MBR, save
    storage space. Bootloader can be easily accessed by absolute address of
    data on the block device. Users can easily change the partition.

    This code reference MTD partition, source "drivers/mtd/cmdlinepart.c"
    About the partition verbose reference
    "Documentation/block/cmdline-partition.txt"

    [akpm@linux-foundation.org: fix printk text]
    [yongjun_wei@trendmicro.com.cn: fix error return code in parse_parts()]
    Signed-off-by: Cai Zhiyong
    Cc: Karel Zak
    Cc: "Wanglin (Albert)"
    Cc: Marius Groeger
    Cc: David Woodhouse
    Cc: Jens Axboe
    Cc: Brian Norris
    Cc: Artem Bityutskiy
    Signed-off-by: Wei Yongjun
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cai Zhiyong
     

11 Sep, 2013

6 commits

  • Pull kconfig updates from Michal Marek:
    "This is the kconfig part of kbuild for v3.12-rc1:
    - post-3.11 search code fixes and micro-optimizations
    - CONFIG_MODULES is no longer a special case; this is needed to
    eventually fix the bug that using KCONFIG_ALLCONFIG breaks
    allmodconfig
    - long long is used to store hex and int values
    - make silentoldconfig no longer warns when a symbol changes from
    tristate to bool (it's a job for make oldconfig)
    - scripts/diffconfig updated to work with newer Pythons
    - scripts/config does not rely on GNU sed extensions"

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: do not allow more than one symbol to have 'option modules'
    kconfig: regenerate bison parser
    kconfig: do not special-case 'MODULES' symbol
    diffconfig: Update script to support python versions 2.5 through 3.3
    diffconfig: Gracefully exit if the default config files are not present
    modules: do not depend on kconfig to set 'modules' option to symbol MODULES
    kconfig: silence warning when parsing auto.conf when a symbol has changed type
    scripts/config: use sed's POSIX interface
    kconfig: switch to "long long" for sanity
    kconfig: simplify symbol-search code
    kconfig: don't allocate n+1 elements in temporary array
    kconfig: minor style fixes in symbol-search code
    kconfig/[mn]conf: shorten title in search-box
    kconfig: avoid multiple calls to strlen
    Documentation/kconfig: more concise and straightforward search explanation

    Linus Torvalds
     
  • Pull battery/power supply driver updates from Anton Vorontsov:
    "New drivers:

    - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM).

    - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora).

    - Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal
    Creek Technologies).

    - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and
    Marek Belisko (Golden Delicious Computers). The driver is used on
    Freerunner GTA04 phones.

    Highlighted fixes and improvements:

    - Suspend/wakeup logic improvements: power supply objects will block
    system suspend until all power supply events are processed. Thanks
    to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google)"

    * tag 'for-v3.12' of git://git.infradead.org/battery-2.6:
    rx51_battery: Fix channel number when reading adc value
    power: Add twl4030_madc battery driver.
    bq24190_charger: Workaround SS definition problem on i386 builds
    power_supply: Prevent suspend until power supply events are processed
    vexpress-poweroff: Should depend on the required infrastructure
    twl4030-charger: Fix compiler warning with regulator_enable()
    rx51_battery: Replace hardcoded channels values.
    bq24190_charger: Add support for TI BQ24190 Battery Charger
    ab8500-charger: We print an unintended error message
    max8925_power: Fix missing of_node_put
    power_supply: Replace strict_strtol() with kstrtol()
    power: Add APM X-Gene system reboot driver
    power_supply: tosa_battery: Get rid of irq_to_gpio usage
    power supply: collie_battery: Convert to use dev_pm_ops
    power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
    power: reset: Add msm restart support
    MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers

    Linus Torvalds
     
  • Pull device tree core updates from Grant Likely:
    "Generally minor changes. A bunch of bug fixes, particularly for
    initialization and some refactoring. Most notable change if feeding
    the entire flattened tree into the random pool at boot. May not be
    significant, but shouldn't hurt either"

    Tim Bird questions whether the boot time cost of the random feeding may
    be noticeable. And "add_device_randomness()" is definitely not some
    speed deamon of a function.

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
    of/platform: add error reporting to of_amba_device_create()
    irq/of: Fix comment typo for irq_of_parse_and_map
    of: Feed entire flattened device tree into the random pool
    of/fdt: Clean up casting in unflattening path
    of/fdt: Remove duplicate memory clearing on FDT unflattening
    gpio: implement gpio-ranges binding document fix
    of: call __of_parse_phandle_with_args from of_parse_phandle
    of: introduce of_parse_phandle_with_fixed_args
    of: move of_parse_phandle()
    of: move documentation of of_parse_phandle_with_args
    of: Fix missing memory initialization on FDT unflattening
    of: consolidate definition of early_init_dt_alloc_memory_arch()
    of: Make of_get_phy_mode() return int i.s.o. const int
    include: dt-binding: input: create a DT header defining key codes.
    of/platform: Staticize of_platform_device_create_pdata()
    of: Specify initrd location using 64-bit
    dt: Typo fix
    OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled

    Linus Torvalds
     
  • Pull slave-dmaengine updates from Vinod Koul:
    "This pull brings:
    - Andy's DW driver updates
    - Guennadi's sh driver updates
    - Pl08x driver fixes from Tomasz & Alban
    - Improvements to mmp_pdma by Daniel
    - TI EDMA fixes by Joel
    - New drivers:
    - Hisilicon k3dma driver
    - Renesas rcar dma driver
    - New API for publishing slave driver capablities
    - Various fixes across the subsystem by Andy, Jingoo, Sachin etc..."

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (94 commits)
    dma: edma: Remove limits on number of slots
    dma: edma: Leave linked to Null slot instead of DUMMY slot
    dma: edma: Find missed events and issue them
    ARM: edma: Add function to manually trigger an EDMA channel
    dma: edma: Write out and handle MAX_NR_SG at a given time
    dma: edma: Setup parameters to DMA MAX_NR_SG at a time
    dmaengine: pl330: use dma_set_max_seg_size to set the sg limit
    dmaengine: dma_slave_caps: remove sg entries
    dma: replace devm_request_and_ioremap by devm_ioremap_resource
    dma: ste_dma40: Fix potential null pointer dereference
    dma: ste_dma40: Remove duplicate const
    dma: imx-dma: Remove redundant NULL check
    dma: dmagengine: fix function names in comments
    dma: add driver for R-Car HPB-DMAC
    dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
    dma: imx-sdma: Staticize sdma_driver_data structures
    pch_dma: Add MODULE_DEVICE_TABLE
    dmaengine: PL08x: Add cyclic transfer support
    dmaengine: PL08x: Fix reading the byte count in cctl
    dmaengine: PL08x: Add support for different maximum transfer size
    ...

    Linus Torvalds
     
  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.12:

    Core:
    - Support Allocation Units 8MB-64MB in SD3.0, previous max was 4MB.
    - The slot-gpio helper can now handle GPIO debouncing card-detect.
    - Read supported voltages from DT "voltage-ranges" property.

    Drivers:
    - dw_mmc: Add support for ARC architecture, and support exynos5420.
    - mmc_spi: Support CD/RO GPIOs.
    - sh_mobile_sdhi: Add compatibility for more Renesas SoCs.
    - sh_mmcif: Add DT support for DMA channels"

    * tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (50 commits)
    Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
    mmc: dw_mmc: Add support for ARC
    mmc: sdhci-s3c: initialize host->quirks2 for using quirks2
    mmc: sdhci-s3c: fix the wrong register value, when clock is disabled
    mmc: esdhc: add support to get voltage from device-tree
    mmc: sdhci: get voltage from sdhc host
    mmc: core: parse voltage from device-tree
    mmc: omap_hsmmc: use the generic config for omap2plus devices
    mmc: omap_hsmmc: clear status flags before starting a new command
    mmc: dw_mmc: exynos: Add a new compatible string for exynos5420
    mmc: sh_mmcif: revision-specific CLK_CTRL2 handling
    mmc: sh_mmcif: revision-specific Command Completion Signal handling
    mmc: sh_mmcif: add support for Device Tree DMA bindings
    mmc: sh_mmcif: move header include from header into .c
    mmc: SDHI: add DT compatibility strings for further SoCs
    mmc: dw_mmc-pci: enable bus-mastering mode
    mmc: dw_mmc-pci: get resources from a proper BAR
    mmc: tmio-mmc: Remove .set_pwr() callback from platform data
    mmc: tmio-mmc: Remove .get_cd() callback from platform data
    mmc: sh_mobile_sdhi: Remove .set_pwr() callback from platform data
    ...

    Linus Torvalds
     
  • Pull device-mapper updates from Mike Snitzer:
    "Add the ability to collect I/O statistics on user-defined regions of a
    device-mapper device. This dm-stats code required the reintroduction
    of a div64_u64_rem() helper, but as a separate method that doesn't
    slow down div64_u64() -- especially on 32-bit systems.

    Allow the error target to replace request-based DM devices (e.g.
    multipath) in addition to bio-based DM devices.

    Various other small code fixes and improvements to thin-provisioning,
    DM cache and the DM ioctl interface"

    * tag 'dm-3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
    dm stripe: silence a couple sparse warnings
    dm: add statistics support
    dm thin: always return -ENOSPC if no_free_space is set
    dm ioctl: cleanup error handling in table_load
    dm ioctl: increase granularity of type_lock when loading table
    dm ioctl: prevent rename to empty name or uuid
    dm thin: set pool read-only if breaking_sharing fails block allocation
    dm thin: prefix pool error messages with pool device name
    dm: allow error target to replace bio-based and request-based targets
    math64: New separate div64_u64_rem helper
    dm space map: optimise sm_ll_dec and sm_ll_inc
    dm btree: prefetch child nodes when walking tree for a dm_btree_del
    dm btree: use pop_frame in dm_btree_del to cleanup code
    dm cache: eliminate holes in cache structure
    dm cache: fix stacking of geometry limits
    dm thin: fix stacking of geometry limits
    dm thin: add data block size limits to Documentation
    dm cache: add data block size limits to code and Documentation
    dm cache: document metadata device is exclussive to a cache
    dm: stop using WQ_NON_REENTRANT

    Linus Torvalds
     

10 Sep, 2013

8 commits

  • Pull dmaengine update from Dan Williams:
    "Collection of random updates to the core and some end-driver fixups
    for ioatdma and mv_xor:
    - NUMA aware channel allocation
    - Cleanup dmatest debugfs interface
    - ioat: make raid-support Atom only
    - mv_xor: big endian

    Aside from the top three commits these have all had some soak time in
    -next. The top commit fixes a recent build breakage.

    It has been a long while since my last pull request, hopefully it does
    not show. Thanks to Vinod for keeping an eye on drivers/dma/ this
    past year"

    * tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
    dmaengine: dma_sync_wait and dma_find_channel undefined
    MAINTAINERS: update email for Dan Williams
    dma: mv_xor: Fix incorrect error path
    ioatdma: silence GCC warnings
    dmaengine: make dma_channel_rebalance() NUMA aware
    dmaengine: make dma_submit_error() return an error code
    ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies
    mv_xor: support big endian systems using descriptor swap feature
    mv_xor: use {readl, writel}_relaxed instead of __raw_{readl, writel}
    dmatest: print message on debug level in case of no error
    dmatest: remove IS_ERR_OR_NULL checks of debugfs calls
    dmatest: make module parameters writable

    Linus Torvalds
     
  • Pull clock framework changes from Michael Turquette:
    "The common clk framework changes for 3.12 are dominated by clock
    driver patches, both new drivers and fixes to existing. A high
    percentage of these are for Samsung platforms like Exynos. Core
    framework fixes and some new features like automagical clock
    re-parenting round out the patches"

    * tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux: (102 commits)
    clk: only call get_parent if there is one
    clk: samsung: exynos5250: Simplify registration of PLL rate tables
    clk: samsung: exynos4: Register PLL rate tables for Exynos4x12
    clk: samsung: exynos4: Register PLL rate tables for Exynos4210
    clk: samsung: exynos4: Reorder registration of mout_vpllsrc
    clk: samsung: pll: Add support for rate configuration of PLL46xx
    clk: samsung: pll: Use new registration method for PLL46xx
    clk: samsung: pll: Add support for rate configuration of PLL45xx
    clk: samsung: pll: Use new registration method for PLL45xx
    clk: samsung: exynos4: Rename exynos4_plls to exynos4x12_plls
    clk: samsung: exynos4: Remove checks for DT node
    clk: samsung: exynos4: Remove unused static clkdev aliases
    clk: samsung: Modify _get_rate() helper to use __clk_lookup()
    clk: samsung: exynos4: Use separate aliases for cpufreq related clocks
    clocksource: samsung_pwm_timer: Get clock from device tree
    ARM: dts: exynos4: Specify PWM clocks in PWM node
    pwm: samsung: Update DT bindings documentation to cover clocks
    clk: Move symbol export to proper location
    clk: fix new_parent dereference before null check
    clk: wm831x: Initialise wm831x pointer on init
    ...

    Linus Torvalds
     
  • Pull mtd updates from David Woodhouse:
    - factor out common code from MTD tests
    - nand-gpio cleanup and portability to non-ARM
    - m25p80 support for 4-byte addressing chips, other new chips
    - pxa3xx cleanup and support for new platforms
    - remove obsolete alauda, octagon-5066 drivers
    - erase/write support for bcm47xxsflash
    - improve detection of ECC requirements for NAND, controller setup
    - NFC acceleration support for atmel-nand, read/write via SRAM
    - etc

    * tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd: (184 commits)
    mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
    mtd: ofpart: use for_each_child_of_node() macro
    mtd: mtdswap: replace strict_strtoul() with kstrtoul()
    mtd cs553x_nand: use kzalloc() instead of memset
    mtd: atmel_nand: fix error return code in atmel_nand_probe()
    mtd: bcm47xxsflash: writing support
    mtd: bcm47xxsflash: implement erasing support
    mtd: bcm47xxsflash: convert to module_platform_driver instead of init/exit
    mtd: bcm47xxsflash: convert kzalloc to avoid invalid access
    mtd: remove alauda driver
    mtd: nand: mxc_nand: mark 'const' properly
    mtd: maps: cfi_flagadm: add missing __iomem annotation
    mtd: spear_smi: add missing __iomem annotation
    mtd: r852: Staticize local symbols
    mtd: nandsim: Staticize local symbols
    mtd: impa7: add missing __iomem annotation
    mtd: sm_ftl: Staticize local symbols
    mtd: m25p80: add support for mr25h10
    mtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable
    mtd: m25p80: Pass flags through CAT25_INFO macro
    ...

    Linus Torvalds
     
  • Pull DMA mapping update from Marek Szyprowski:
    "This contains an addition of Device Tree support for reserved memory
    regions (Contiguous Memory Allocator is one of the drivers for it) and
    changes required by the KVM extensions for PowerPC architectue"

    * 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    ARM: init: add support for reserved memory defined by device tree
    drivers: of: add initialization code for dma reserved memory
    drivers: of: add function to scan fdt nodes given by path
    drivers: dma-contiguous: clean source code and prepare for device tree

    Linus Torvalds
     
  • Pull VFIO update from Alex Williamson:
    "VFIO updates include safer default file flags for VFIO device fds, an
    external user interface exported to allow other modules to hold
    references to VFIO groups, a fix to test for extended config space on
    PCIe and PCI-x, and new hot reset interfaces for PCI devices which
    allows the user to do PCI bus/slot resets when all of the devices
    affected by the reset are owned by the user.

    For this last feature, the PCI bus reset interface, I depend on
    changes already merged from Bjorn's PCI pull request. I therefore
    merged my tree up to commit cb3e433, which I think was the correct
    action, but as Stephen Rothwell noted, I failed to provide a commit
    message indicating why the merge was required. Sorry for that.
    Thanks, Alex"

    * tag 'vfio-v3.12-rc0' of git://github.com/awilliam/linux-vfio:
    vfio: fix documentation
    vfio-pci: PCI hot reset interface
    vfio-pci: Test for extended config space
    vfio-pci: Use fdget() rather than eventfd_fget()
    vfio: Add O_CLOEXEC flag to vfio device fd
    vfio: use get_unused_fd_flags(0) instead of get_unused_fd()
    vfio: add external user support

    Linus Torvalds
     
  • Pull NFS client updates from Trond Myklebust:
    "Highlights include:

    - Fix NFSv4 recovery so that it doesn't recover lost locks in cases
    such as lease loss due to a network partition, where doing so may
    result in data corruption. Add a kernel parameter to control
    choice of legacy behaviour or not.
    - Performance improvements when 2 processes are writing to the same
    file.
    - Flush data to disk when an RPCSEC_GSS session timeout is imminent.
    - Implement NFSv4.1 SP4_MACH_CRED state protection to prevent other
    NFS clients from being able to manipulate our lease and file
    locking state.
    - Allow sharing of RPCSEC_GSS caches between different rpc clients.
    - Fix the broken NFSv4 security auto-negotiation between client and
    server.
    - Fix rmdir() to wait for outstanding sillyrename unlinks to complete
    - Add a tracepoint framework for debugging NFSv4 state recovery
    issues.
    - Add tracing to the generic NFS layer.
    - Add tracing for the SUNRPC socket connection state.
    - Clean up the rpc_pipefs mount/umount event management.
    - Merge more patches from Chuck in preparation for NFSv4 migration
    support"

    * tag 'nfs-for-3.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (107 commits)
    NFSv4: use mach cred for SECINFO_NO_NAME w/ integrity
    NFS: nfs_compare_super shouldn't check the auth flavour unless 'sec=' was set
    NFSv4: Allow security autonegotiation for submounts
    NFSv4: Disallow security negotiation for lookups when 'sec=' is specified
    NFSv4: Fix security auto-negotiation
    NFS: Clean up nfs_parse_security_flavors()
    NFS: Clean up the auth flavour array mess
    NFSv4.1 Use MDS auth flavor for data server connection
    NFS: Don't check lock owner compatability unless file is locked (part 2)
    NFS: Don't check lock owner compatibility in writes unless file is locked
    nfs4: Map NFS4ERR_WRONG_CRED to EPERM
    nfs4.1: Add SP4_MACH_CRED write and commit support
    nfs4.1: Add SP4_MACH_CRED stateid support
    nfs4.1: Add SP4_MACH_CRED secinfo support
    nfs4.1: Add SP4_MACH_CRED cleanup support
    nfs4.1: Add state protection handler
    nfs4.1: Minimal SP4_MACH_CRED implementation
    SUNRPC: Replace pointer values with task->tk_pid and rpc_clnt->cl_clid
    SUNRPC: Add an identifier for struct rpc_clnt
    SUNRPC: Ensure rpc_task->tk_pid is available for tracepoints
    ...

    Linus Torvalds
     
  • Pull ceph updates from Sage Weil:
    "This includes both the first pile of Ceph patches (which I sent to
    torvalds@vger, sigh) and a few new patches that add support for
    fscache for Ceph. That includes a few fscache core fixes that David
    Howells asked go through the Ceph tree. (Thanks go to Milosz Tanski
    for putting this feature together)

    This first batch of patches (included here) had (has) several
    important RBD bug fixes, hole punch support, several different
    cleanups in the page cache interactions, improvements in the truncate
    code (new truncate mutex to avoid shenanigans with i_mutex), and a
    series of fixes in the synchronous striping read/write code.

    On top of that is a random collection of small fixes all across the
    tree (error code checks and error path cleanup, obsolete wq flags,
    etc)"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (43 commits)
    ceph: use d_invalidate() to invalidate aliases
    ceph: remove ceph_lookup_inode()
    ceph: trivial buildbot warnings fix
    ceph: Do not do invalidate if the filesystem is mounted nofsc
    ceph: page still marked private_2
    ceph: ceph_readpage_to_fscache didn't check if marked
    ceph: clean PgPrivate2 on returning from readpages
    ceph: use fscache as a local presisent cache
    fscache: Netfs function for cleanup post readpages
    FS-Cache: Fix heading in documentation
    CacheFiles: Implement interface to check cache consistency
    FS-Cache: Add interface to check consistency of a cached object
    rbd: fix null dereference in dout
    rbd: fix buffer size for writes to images with snapshots
    libceph: use pg_num_mask instead of pgp_num_mask for pg.seed calc
    rbd: fix I/O error propagation for reads
    ceph: use vfs __set_page_dirty_nobuffers interface instead of doing it inside filesystem
    ceph: allow sync_read/write return partial successed size of read/write.
    ceph: fix bugs about handling short-read for sync read mode.
    ceph: remove useless variable revoked_rdcache
    ...

    Linus Torvalds
     
  • Pull metag architecture changes from James Hogan:
    - Device tree updates for TZ1090 GPIO drivers merged via GPIO tree.
    - Add driver for ImgTec PDC irqchip as found in TZ1090 SoC.
    - Add linux-metag mailing list to MAINTAINERS file.

    * tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
    irq-imgpdc: add ImgTec PDC irqchip driver
    MAINTAINERS: add linux-metag mailing list
    metag: tz1090: instantiate gpio-tz1090-pdc
    metag: tz1090: select and instantiate gpio-tz1090
    metag: tz1090: select and instantiate irq-imgpdc

    Linus Torvalds
     

08 Sep, 2013

4 commits

  • Pull MFD (multi-function device) updates from Samuel Ortiz:
    "For the 3.12 merge window we have one new driver for the DA9063 PMIC
    from Dialog Semiconductor.

    Besides that driver we also have:

    - Device tree support for the s2mps11 driver

    - More devm_* conversion for the pm8921, max89xx, menelaus, tps65010,
    wl1273 and pcf50633-adc drivers.

    - A conversion to threaded IRQ and IRQ domain for the twl6030 driver.

    - A fairly big update for the rtsx driver: Better power saving
    support, better vendor settings handling, and a few fixes.

    - Support for a couple more boards (COMe-bHL6 and COMe-cTH6) for the
    Kontron driver.

    - A conversion to the dev_get_platdata() API for all MFD drivers.

    - A removal of non-DT (legacy) support for the twl6040 driver.

    - A few fixes and additions (Mic detect level) to the wm5110 register
    tables.

    - Regmap support for the davinci_voicecodec driver.

    - The usual bunch of minor cleanups and janitorial fixes"

    * tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (81 commits)
    mfd: ucb1x00-core: Rewrite ucb1x00_add_dev()
    mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for event name
    mfd: ab8500-debugfs: Apply a check for -ENOMEM after allocating memory for sysfs
    mfd: timberdale: Use module_pci_driver
    mfd: timberdale: Remove redundant break
    mfd: timberdale: Staticize local variables
    mfd: ab8500-debugfs: Staticize local variables
    mfd: db8500-prcmu: Staticize clk_mgt
    mfd: db8500-prcmu: Use ANSI function declaration
    mfd: omap-usb-host: Staticize usbhs_driver_name
    mfd: 88pm805: Fix potential NULL pdata dereference
    mfd: 88pm800: Fix potential NULL pdata dereference
    mfd: twl6040: Use regmap for register cache
    mfd: davinci_voicecodec: Provide a regmap for register I/O
    mfd: davinci_voicecodec: Remove unused read and write functions
    mmc: memstick: rtsx: Modify copyright comments
    mmc: rtsx: Clear SD_CLK toggle enable bit if switching voltage fail
    mfd: mmc: rtsx: Change default tx phase
    mfd: pcf50633-adc: Use devm_*() functions
    mfd: rtsx: Copyright modifications
    ...

    Linus Torvalds
     
  • Pull hwmon fixes from Jean Delvare.

    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (emc6w201) Do not declare enum variable
    hwmon: (w83792d) Update module author

    Linus Torvalds
     
  • Pull GPIO updates from Linus Walleij:
    "This is the bulk of GPIO changes for the v3.12 series:

    - A new driver for the TZ1090 PDC which is used on the metag
    architecture.

    - A new driver for the Kontron ETX or COMexpress GPIO block. This is
    found on some ETX x86 devices.

    - A new driver for the Fintek Super-I/O chips, used on some x86
    boards.

    - Added device tree probing on a few select GPIO blocks.

    - Drop the Exynos support from the Samsung GPIO driver.

    The Samsung maintainers have moved over to use the modernized pin
    control driver to provide GPIO for the modern platforms instead.

    - The usual bunch of non-critical fixes and cleanups"

    * tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (36 commits)
    gpio: return -ENOTSUPP if debounce cannot be set
    gpio: improve error path in gpiolib
    gpio: add GPIO support for F71882FG and F71889F
    of: add vendor prefix for Microchip Technology Inc
    gpio: mcp23s08: rename the device tree property
    gpio: samsung: Drop support for Exynos SoCs
    gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()
    gpio: pcf857x: Sort headers alphabetically
    gpio: max7301: Reverting "Do not force SPI speed when using OF Platform"
    gpio: Fix bit masking in Kontron PLD GPIO driver
    gpio: pca953x: fix gpio input on gpio offsets >= 8
    drivers/gpio: simplify use of devm_ioremap_resource
    drivers/gpio/gpio-omap.c: convert comma to semicolon
    gpio-lynxpoint: Fix warning about unbalanced pm_runtime_enable
    gpio: Fix platform driver name in Kontron PLD GPIO driver
    gpio: adnp: Fix segfault if request_threaded_irq fails
    gpio: msm: Staticize local variable 'msm_gpio'
    gpio: gpiolib-of.c: make error message more meaningful by adding the node name and index
    gpio: use dev_get_platdata()
    gpio/mxc: add chained_irq_enter/exit() to mx2_gpio_irq_handler
    ...

    Linus Torvalds
     
  • Pull input updates from Dmitry Torokhov:
    "A new driver for slidebar on Ideapad laptops and a bunch of assorted
    driver fixes"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
    Input: add SYN_MAX and SYN_CNT constants
    Input: max11801_ts - convert to devm
    Input: egalax-ts - fix typo and improve text
    Input: MAINTAINERS - change maintainer for cyttsp driver
    Input: cyttsp4 - kill 'defined but not used' compiler warnings
    Input: add driver for slidebar on Lenovo IdeaPad laptops
    Input: omap-keypad - set up irq type from DT
    Input: omap-keypad - enable wakeup capability for keypad.
    Input: omap-keypad - clear interrupts on open
    Input: omap-keypad - convert to threaded IRQ
    Input: omap-keypad - use bitfiled instead of hardcoded values
    Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer()
    Input: wacom - fix error return code in wacom_probe()
    Input: as5011 - fix error return code in as5011_probe()
    Input: keyboard, serio - simplify use of devm_ioremap_resource
    Input: tegra-kbc - simplify use of devm_ioremap_resource
    Input: htcpen - fix incorrect placement of __initdata
    Input: qt1070 - add power management ops
    Input: wistron_btns - add MODULE_DEVICE_TABLE
    Input: wistron_btns - mark the Medion MD96500 keymap as tested
    ...

    Linus Torvalds
     

07 Sep, 2013

10 commits

  • Merge first round of changes for 3.12 merge window.

    Dmitry Torokhov
     
  • PWM driver consumes at least one and up to three clocks, which need to be
    specified in device tree when used. This patch updates bindings
    documentation to add information about clocks.

    Signed-off-by: Tomasz Figa
    Signed-off-by: Kyungmin Park
    Acked-by: Stephen Warren
    Reviewed-by: Sylwester Nawrocki
    Signed-off-by: Mike Turquette

    Tomasz Figa
     
  • Pull ARM SoC platform changes from Olof Johansson:
    "This branch contains mostly additions and changes to platform
    enablement and SoC-level drivers. Since there's sometimes a
    dependency on device-tree changes, there's also a fair amount of
    those in this branch.

    Pieces worth mentioning are:

    - Mbus driver for Marvell platforms, allowing kernel configuration
    and resource allocation of on-chip peripherals.
    - Enablement of the mbus infrastructure from Marvell PCI-e drivers.
    - Preparation of MSI support for Marvell platforms.
    - Addition of new PCI-e host controller driver for Tegra platforms
    - Some churn caused by sharing of macro names between i.MX 6Q and 6DL
    platforms in the device tree sources and header files.
    - Various suspend/PM updates for Tegra, including LP1 support.
    - Versatile Express support for MCPM, part of big little support.
    - Allwinner platform support for A20 and A31 SoCs (dual and quad
    Cortex-A7)
    - OMAP2+ support for DRA7, a new Cortex-A15-based SoC.

    The code that touches other architectures are patches moving MSI
    arch-specific functions over to weak symbols and removal of
    ARCH_SUPPORTS_MSI, acked by PCI maintainers"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits)
    tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE
    PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource
    ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list
    ARM: dts: vf610-twr: enable i2c0 device
    ARM: dts: i.MX51: Add one more I2C2 pinmux entry
    ARM: dts: i.MX51: Move pins configuration under "iomuxc" label
    ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
    ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
    ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX
    ARM: dts: i.MX27: Disable AUDMUX in the template
    ARM: dts: wandboard: Add support for SDIO bcm4329
    ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
    ARM: dts: imx53-qsb: Make USBH1 functional
    ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module
    ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module
    ARM: dts: imx6qdl-sabresd: Add touchscreen support
    ARM: imx: add ocram clock for imx53
    ARM: dts: imx: ocram size is different between imx6q and imx6dl
    ARM: dts: imx27-phytec-phycore-som: Fix regulator settings
    ARM: dts: i.MX27: Remove clock name from CPU node
    ...

    Linus Torvalds
     
  • Pull ARM SoC DT updates from Olof Johansson:
    "Device tree and bindings updates for 3.12.

    General additions of various on-chip and on-board peripherals on
    various platforms as support gets added. Some of the bigger changes
    are:

    - Addition of (new) PCI-e support on Tegra.
    - More Tegra4 support, including PMC configuration for Dalmore.
    - Addition of a new board for Exynos4 (trats2) and more bindings for
    4x12 IP.
    - Addition of Allwinner A20 and A31 SoC and board files.
    - Move of the ST Ericsson device tree files to now use ste-* prefix.
    - More move of hardware description of shmobile platforms to DT.
    - Two new board dts files for Freescale MXs"

    * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
    dts: Rename DW APB timer compatible strings
    dts: Deprecate ALTR as a vendor prefix
    of: add vendor prefix for Altera Corp.
    ARM: at91/dt: sam9x5ek: add sound configuration
    ARM: at91/dt: sam9x5ek: enable SSC
    ARM: at91/dt: sam9x5ek: add WM8731 codec
    ARM: at91/dt: sam9x5: add SSC DMA parameters
    ARM: at91/dt: add at91rm9200 PQFP package version
    ARM: at91: at91rm9200: set default mmc0 pinctrl-names
    ARM: at91: at91sam9n12: correct pin number of gpio-key
    ARM: at91: at91sam9n12: add qt1070 support
    ARM: at91: at91sam9n12: add pinctrl of TWI
    ARM: at91: Add PMU support for sama5d3
    ARM: at91: at91sam9260: add missing pinctrl-names on mmc
    ARM: tegra: configure power off for Dalmore
    ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
    ARM: dts: add sdio blocks to bcm28155-ap board
    ARM: dts: align sdio numbers to HW definition
    ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
    ARM: sun7i: Add Allwinner A20 DTSI
    ...

    Linus Torvalds
     
  • Pull ARM64 update from Catalin Marinas:
    - User tagged pointers support (top 8-bit of user pointers
    automatically ignored by the CPU).
    - Kernel mode NEON (no users for arm64 yet but work in progress).
    - arm64 kernel Image header extended to accommodate future EFI stub.
    - Remove BogoMIPS reporting (not relevant, it's just the timer
    frequency).
    - Clean-up (EM_AARCH64/EM_ARM to elf-em.h, ELF notes in read-only
    segment, unused variable).
    - Bug-fixes (RAM boundaries not 2MB aligned, perf, includes).

    * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
    Documentation/arm64: clarify requirements for DTB placement
    arm64: mm: permit use of tagged pointers at EL0
    Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
    arm64: Remove unused cpu_name ascii in arch/arm64/mm/proc.S
    arm64: delay: don't bother reporting bogomips in /proc/cpuinfo
    arm64: Fix mapping of memory banks not ending on a PMD_SIZE boundary
    arm64: move elf notes into readonly segment
    arm64: Enable interrupts in the EL0 undef handler
    arm64: Expand arm64 image header
    ARM64: include: asm: include "asm/types.h" in "pgtable-2level-types.h" and "pgtable-3level-types.h"
    arm64: add support for kernel mode NEON
    arm64: perf: fix ARMv8 EVTYPE_MASK to include NSH bit
    arm64: perf: fix group validation when using enable_on_exec

    Linus Torvalds
     
  • Pull powerpc updates from Ben Herrenschmidt:
    "Here's the powerpc batch for this merge window. Some of the
    highlights are:

    - A bunch of endian fixes ! We don't have full LE support yet in that
    release but this contains a lot of fixes all over arch/powerpc to
    use the proper accessors, call the firmware with the right endian
    mode, etc...

    - A few updates to our "powernv" platform (non-virtualized, the one
    to run KVM on), among other, support for bridging the P8 LPC bus
    for UARTs, support and some EEH fixes.

    - Some mpc51xx clock API cleanups in preparation for a clock API
    overhaul

    - A pile of cleanups of our old math emulation code, including better
    support for using it to emulate optional FP instructions on
    embedded chips that otherwise have a HW FPU.

    - Some infrastructure in selftest, for powerpc now, but could be
    generalized, initially used by some tests for our perf instruction
    counting code.

    - A pile of fixes for hotplug on pseries (that was seriously
    bitrotting)

    - The usual slew of freescale embedded updates, new boards, 64-bit
    hiberation support, e6500 core PMU support, etc..."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
    powerpc: Correct FSCR bit definitions
    powerpc/xmon: Fix printing of set of CPUs in xmon
    powerpc/pseries: Move lparcfg.c to platforms/pseries
    powerpc/powernv: Return secondary CPUs to firmware on kexec
    powerpc/btext: Fix CONFIG_PPC_EARLY_DEBUG_BOOTX on ppc32
    powerpc: Cleanup handling of the DSCR bit in the FSCR register
    powerpc/pseries: Child nodes are not detached by dlpar_detach_node
    powerpc/pseries: Add mising of_node_put in delete_dt_node
    powerpc/pseries: Make dlpar_configure_connector parent node aware
    powerpc/pseries: Do all node initialization in dlpar_parse_cc_node
    powerpc/pseries: Fix parsing of initial node path in update_dt_node
    powerpc/pseries: Pack update_props_workarea to map correctly to rtas buffer header
    powerpc/pseries: Fix over writing of rtas return code in update_dt_node
    powerpc/pseries: Fix creation of loop in device node property list
    powerpc: Skip emulating & leave interrupts off for kernel program checks
    powerpc: Add more exception trampolines for hypervisor exceptions
    powerpc: Fix location and rename exception trampolines
    powerpc: Add more trap names to xmon
    powerpc/pseries: Add a warning in the case of cross-cpu VPA registration
    powerpc: Update the 00-Index in Documentation/powerpc
    ...

    Linus Torvalds
     
  • Pull trivial tree from Jiri Kosina:
    "The usual trivial updates all over the tree -- mostly typo fixes and
    documentation updates"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
    doc: Documentation/cputopology.txt fix typo
    treewide: Convert retrun typos to return
    Fix comment typo for init_cma_reserved_pageblock
    Documentation/trace: Correcting and extending tracepoint documentation
    mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
    power: Documentation: Update s2ram link
    doc: fix a typo in Documentation/00-INDEX
    Documentation/printk-formats.txt: No casts needed for u64/s64
    doc: Fix typo "is is" in Documentations
    treewide: Fix printks with 0x%#
    zram: doc fixes
    Documentation/kmemcheck: update kmemcheck documentation
    doc: documentation/hwspinlock.txt fix typo
    PM / Hibernate: add section for resume options
    doc: filesystems : Fix typo in Documentations/filesystems
    scsi/megaraid fixed several typos in comments
    ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
    treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
    page_isolation: Fix a comment typo in test_pages_isolated()
    doc: fix a typo about irq affinity
    ...

    Linus Torvalds
     
  • Pull HID updates from Jiri Kosina:
    "Highlights:

    - conversion of HID subsystem to use devm-based resource management,
    from Benjamin Tissoires

    - i2c-hid support for DT bindings, from Benjamin Tissoires

    - much improved support for Win8-multitouch devices, from Benjamin
    Tissoires

    - cleanup of core code using common hidinput_input_event(), from
    David Herrmann

    - fix for bug in implement() access to the bit stream (causing oops)
    that has been present in the code for ages, but devices that are
    able to trigger it have started to appear only now, from Jiri
    Kosina

    - fixes for CVE-2013-2899, CVE-2013-2898, CVE-2013-2896,
    CVE-2013-2892, CVE-2013-2888 (all triggerable only by specially
    crafted malicious HW devices plugged into the system), from Kees
    Cook

    - hidraw oops fix, from Manoj Chourasia

    - various smaller fixes here and there, support for a bunch of new
    devices by various contributors"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (53 commits)
    HID: MAINTAINERS: add roccat drivers
    HID: hid-sensor-hub: change kmalloc + memcpy by kmemdup
    HID: hid-sensor-hub: move to devm_kzalloc
    HID: hid-sensor-hub: fix indentation accross the code
    HID: move HID_REPORT_TYPES closer to the report-definitions
    HID: check for NULL field when setting values
    HID: picolcd_core: validate output report details
    HID: sensor-hub: validate feature report details
    HID: ntrig: validate feature report details
    HID: pantherlord: validate output report details
    HID: hid-wiimote: print small buffers via %*phC
    HID: uhid: improve uhid example client
    HID: Correct the USB IDs for the new Macbook Air 6
    HID: wiimote: add support for Guitar-Hero guitars
    HID: wiimote: add support for Guitar-Hero drums
    Input: introduce BTN/ABS bits for drums and guitars
    HID: battery: don't do DMA from stack
    HID: roccat: add support for KonePureOptical v2
    HID: picolcd: Prevent NULL pointer dereference on _remove()
    HID: usbhid: quirk for N-Trig DuoSense Touch Screen
    ...

    Linus Torvalds
     
  • Pull ext3, reiserfs, udf & isofs fixes from Jan Kara:
    "The contains a bunch of ext3 cleanups and minor improvements, major
    reiserfs locking changes which should hopefully fix deadlocks
    introduced by BKL removal, and udf/isofs changes to refuse mounting fs
    rw instead of mounting it ro automatically which makes eject button
    work as expected for all media (see the changelog for why userspace
    should be ok with this change)"

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    jbd: use a single printk for jbd_debug()
    reiserfs: locking, release lock around quota operations
    reiserfs: locking, handle nested locks properly
    reiserfs: locking, push write lock out of xattr code
    jbd: relocate assert after state lock in journal_commit_transaction()
    udf: Refuse RW mount of the filesystem instead of making it RO
    udf: Standardize return values in mount sequence
    isofs: Refuse RW mount of the filesystem instead of making it RO
    ext3: allow specifying external journal by pathname mount option
    jbd: remove unneeded semicolon

    Linus Torvalds
     
  • Pull f2fs updates from Jaegeuk Kim:
    "This patch-set includes the following major enhancement patches:
    - support inline xattrs
    - add sysfs support to control GCs explicitly
    - add proc entry to show the current segment usage information
    - improve the GC/SSR performance

    The other bug fixes are as follows:
    - avoid the overflow on status calculation
    - fix some error handling routines
    - fix inconsistent xattr states after power-off-recovery
    - fix incorrect xattr node offset definition
    - fix deadlock condition in fsync
    - fix the fdatasync routine for power-off-recovery"

    * tag 'for-f2fs-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (40 commits)
    f2fs: optimize gc for better performance
    f2fs: merge more bios of node block writes
    f2fs: avoid an overflow during utilization calculation
    f2fs: trigger GC when there are prefree segments
    f2fs: use strncasecmp() simplify the string comparison
    f2fs: fix omitting to update inode page
    f2fs: support the inline xattrs
    f2fs: add the truncate_xattr_node function
    f2fs: introduce __find_xattr for readability
    f2fs: reserve the xattr space dynamically
    f2fs: add flags for inline xattrs
    f2fs: fix error return code in init_f2fs_fs()
    f2fs: fix wrong BUG_ON condition
    f2fs: fix memory leak when init f2fs filesystem fail
    f2fs: fix a compound statement label error
    f2fs: avoid writing inode redundantly when creating a file
    f2fs: alloc_page() doesn't return an ERR_PTR
    f2fs: should cover i_xattr_nid with its xattr node page lock
    f2fs: check the free space first in new_node_page
    f2fs: clean up the needless end 'return' of void function
    ...

    Linus Torvalds
     

06 Sep, 2013

3 commits

  • w83792d was written by me in 2004, I'd like to update my first name
    into my current one to keep consistent, and delete invalid address.

    Signed-off-by: Shane Huang
    Signed-off-by: Jean Delvare

    Shane Huang
     
  • …3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus

    Jiri Kosina
     
  • Currently the fscache code expect the netfs to call fscache_readpages_or_alloc
    inside the aops readpages callback. It marks all the pages in the list
    provided by readahead with PG_private_2. In the cases that the netfs fails to
    read all the pages (which is legal) it ends up returning to the readahead and
    triggering a BUG. This happens because the page list still contains marked
    pages.

    This patch implements a simple fscache_readpages_cancel function that the netfs
    should call before returning from readpages. It will revoke the pages from the
    underlying cache backend and unmark them.

    The problem was originally worked out in the Ceph devel tree, but it also
    occurs in CIFS. It appears that NFS, AFS and 9P are okay as read_cache_pages()
    will clean up the unprocessed pages in the case of an error.

    This can be used to address the following oops:

    [12410647.597278] BUG: Bad page state in process petabucket pfn:3d504e
    [12410647.597292] page:ffffea000f541380 count:0 mapcount:0 mapping:
    (null) index:0x0
    [12410647.597298] page flags: 0x200000000001000(private_2)

    ...

    [12410647.597334] Call Trace:
    [12410647.597345] [] dump_stack+0x19/0x1b
    [12410647.597356] [] bad_page+0xc7/0x120
    [12410647.597359] [] free_pages_prepare+0x10e/0x120
    [12410647.597361] [] free_hot_cold_page+0x40/0x170
    [12410647.597363] [] __put_single_page+0x27/0x30
    [12410647.597365] [] put_page+0x25/0x40
    [12410647.597376] [] ceph_readpages+0x2e9/0x6e0 [ceph]
    [12410647.597379] [] __do_page_cache_readahead+0x1af/0x260
    [12410647.597382] [] ra_submit+0x21/0x30
    [12410647.597384] [] filemap_fault+0x254/0x490
    [12410647.597387] [] __do_fault+0x6f/0x4e0
    [12410647.597391] [] ? __switch_to+0x16d/0x4a0
    [12410647.597395] [] ? finish_task_switch+0x5a/0xc0
    [12410647.597398] [] handle_pte_fault+0xf6/0x930
    [12410647.597401] [] ? pte_mfn_to_pfn+0x93/0x110
    [12410647.597403] [] ? xen_pmd_val+0xe/0x10
    [12410647.597405] [] ? __raw_callee_save_xen_pmd_val+0x11/0x1e
    [12410647.597407] [] handle_mm_fault+0x251/0x370
    [12410647.597411] [] ? call_rwsem_down_read_failed+0x14/0x30
    [12410647.597414] [] __do_page_fault+0x1aa/0x550
    [12410647.597418] [] ? up_write+0x1d/0x20
    [12410647.597422] [] ? vm_mmap_pgoff+0xbc/0xe0
    [12410647.597425] [] ? SyS_mmap_pgoff+0xd8/0x240
    [12410647.597427] [] do_page_fault+0xe/0x10
    [12410647.597431] [] page_fault+0x28/0x30

    Signed-off-by: Milosz Tanski
    Signed-off-by: David Howells

    Milosz Tanski