11 Sep, 2013

1 commit

  • For a long time no filesystem has been using vfs_follow_link, and as seen
    by recent filesystem submissions any new use is accidental as well.

    Remove vfs_follow_link, document the replacement in
    Documentation/filesystems/porting and also rename __vfs_follow_link
    to match its only caller better.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Christoph Hellwig
     

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

13 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
     
  • Fix a heading in the documentation to make it consistent with the contents
    list.

    Signed-off-by: David Howells

    David Howells
     
  • Extend the fscache netfs API so that the netfs can ask as to whether a cache
    object is up to date with respect to its corresponding netfs object:

    int fscache_check_consistency(struct fscache_cookie *cookie)

    This will call back to the netfs to check whether the auxiliary data associated
    with a cookie is correct. It returns 0 if it is and -ESTALE if it isn't; it
    may also return -ENOMEM and -ERESTARTSYS.

    The backends now have to implement a mandatory operation pointer:

    int (*check_consistency)(struct fscache_object *object)

    that corresponds to the above API call. FS-Cache takes care of pinning the
    object and the cookie in memory and managing this call with respect to the
    object state.

    Original-author: Hongyi Jia
    Signed-off-by: David Howells
    cc: Hongyi Jia
    cc: Milosz Tanski

    David Howells
     
  • Pull ARM updates from Russell King:
    "This set includes adding support for Neon acceleration of RAID6 XOR
    code from Ard Biesheuvel, cache flushing and barrier updates from Will
    Deacon, and a cleanup to the ARM debug code which reduces the amount
    of code by about 500 lines.

    A few other cleanups, such as constifying the machine descriptors
    which already shouldn't be written to, cleaning up the printing of the
    L2 cache size"

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (55 commits)
    ARM: 7826/1: debug: support debug ll on hisilicon soc
    ARM: 7830/1: delay: don't bother reporting bogomips in /proc/cpuinfo
    ARM: 7829/1: Add ".text.unlikely" and ".text.hot" to arm unwind tables
    ARM: 7828/1: ARMv7-M: implement restart routine common to all v7-M machines
    ARM: 7827/1: highbank: fix debug uart virtual address for LPAE
    ARM: 7823/1: errata: workaround Cortex-A15 erratum 773022
    ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra
    ARM: 7793/1: debug: use generic option for ep93xx PL10x debug port
    ARM: debug: move SPEAr debug to generic PL01x code
    ARM: debug: move davinci debug to generic 8250 code
    ARM: debug: move keystone debug to generic 8250 code
    ARM: debug: remove DEBUG_ROCKCHIP_UART
    ARM: debug: provide generic option choices for 8250 and PL01x ports
    ARM: debug: move PL01X debug include into arch/arm/include/debug/
    ARM: debug: provide PL01x debug uart phys/virt address configuration options
    ARM: debug: add support for word accesses to debug/8250.S
    ARM: debug: move 8250 debug include into arch/arm/include/debug/
    ARM: debug: provide 8250 debug uart phys/virt address configuration options
    ARM: debug: provide 8250 debug uart register shift configuration option
    ARM: debug: provide 8250 debug uart flow control configuration option
    ...

    Linus Torvalds
     
  • Signed-off-by: Zi Shen Lim
    Signed-off-by: Alex Williamson

    Zi Shen Lim
     
  • Pull networking changes from David Miller:
    "Noteworthy changes this time around:

    1) Multicast rejoin support for team driver, from Jiri Pirko.

    2) Centralize and simplify TCP RTT measurement handling in order to
    reduce the impact of bad RTO seeding from SYN/ACKs. Also, when
    both timestamps and local RTT measurements are available prefer
    the later because there are broken middleware devices which
    scramble the timestamp.

    From Yuchung Cheng.

    3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
    memory consumed to queue up unsend user data. From Eric Dumazet.

    4) Add a "physical port ID" abstraction for network devices, from
    Jiri Pirko.

    5) Add a "suppress" operation to influence fib_rules lookups, from
    Stefan Tomanek.

    6) Add a networking development FAQ, from Paul Gortmaker.

    7) Extend the information provided by tcp_probe and add ipv6 support,
    from Daniel Borkmann.

    8) Use RCU locking more extensively in openvswitch data paths, from
    Pravin B Shelar.

    9) Add SCTP support to openvswitch, from Joe Stringer.

    10) Add EF10 chip support to SFC driver, from Ben Hutchings.

    11) Add new SYNPROXY netfilter target, from Patrick McHardy.

    12) Compute a rate approximation for sending in TCP sockets, and use
    this to more intelligently coalesce TSO frames. Furthermore, add
    a new packet scheduler which takes advantage of this estimate when
    available. From Eric Dumazet.

    13) Allow AF_PACKET fanouts with random selection, from Daniel
    Borkmann.

    14) Add ipv6 support to vxlan driver, from Cong Wang"

    Resolved conflicts as per discussion.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
    openvswitch: Fix alignment of struct sw_flow_key.
    netfilter: Fix build errors with xt_socket.c
    tcp: Add missing braces to do_tcp_setsockopt
    caif: Add missing braces to multiline if in cfctrl_linkup_request
    bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
    vxlan: Fix kernel panic on device delete.
    net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
    net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
    icplus: Use netif_running to determine device state
    ethernet/arc/arc_emac: Fix huge delays in large file copies
    tuntap: orphan frags before trying to set tx timestamp
    tuntap: purge socket error queue on detach
    qlcnic: use standard NAPI weights
    ipv6:introduce function to find route for redirect
    bnx2x: VF RSS support - VF side
    bnx2x: VF RSS support - PF side
    vxlan: Notify drivers for listening UDP port changes
    net: usbnet: update addr_assign_type if appropriate
    driver/net: enic: update enic maintainers and driver
    driver/net: enic: Exposing symbols for Cisco's low latency driver
    ...

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:
    "This series contains:
    - Exynos s5p-mfc driver got support for VP8 encoder
    - Some SoC drivers gained support for asynchronous registration
    (needed for DT)
    - The RC subsystem gained support for RC activity LED;
    - New drivers added: a video decoder(adv7842), a video encoder
    (adv7511), a new GSPCA driver (stk1135) and support for Renesas
    R-Car (vsp1)
    - the first SDR kernel driver: mirics msi3101. Due to some troubles
    with the driver, and because the API is still under discussion, it
    will be merged at staging for 3.12. Need to rework on it
    - usual new boards additions, fixes, cleanups and driver
    improvements"

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (242 commits)
    [media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0
    [media] exynos4-is: Fix entity unregistration on error path
    [media] exynos-gsc: Register v4l2 device
    [media] exynos4-is: Fix fimc-lite bayer formats
    [media] em28xx: fix assignment of the eeprom data
    [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
    [media] usbtv: Throw corrupted frames away
    [media] usbtv: Fix deinterlacing
    [media] v4l2: added missing mutex.h include to v4l2-ctrls.h
    [media] DocBook: upgrade media_api DocBook version to 4.2
    [media] ml86v7667: fix compile warning: 'ret' set but not used
    [media] s5p-g2d: Fix registration failure
    [media] media: coda: Fix DT driver data pointer for i.MX27
    [media] s5p-mfc: Fix input/output format reporting
    [media] v4l: vsp1: Fix mutex double lock at streamon time
    [media] v4l: vsp1: Add support for RT clock
    [media] v4l: vsp1: Initialize media device bus_info field
    [media] davinci: vpif_capture: fix error return code in vpif_probe()
    [media] davinci: vpif_display: fix error return code in vpif_probe()
    [media] MAINTAINERS: add entries for adv7511 and adv7842
    ...

    Linus Torvalds
     
  • Pull drm tree changes from Dave Airlie:
    "This is the main drm pull request, I have some overlap with sound and
    arm-soc, the sound patch is acked and may conflict based on -next
    reports but should be a trivial fixup, which I'll leave to you!

    Highlights:

    - new drivers:

    MSM driver from Rob Clark

    - non-drm:

    switcheroo and hdmi audio driver support for secondary GPU
    poweroff, so drivers can use runtime PM to poweroff the GPUs. This
    can save 5 or 6W on some optimus laptops.

    - drm core:

    combined GEM and TTM VMA manager
    per-filp mmap permission tracking
    initial rendernode support (via a runtime enable for now, until we get api stable),
    remove old proc support,
    lots of cleanups of legacy code
    hdmi vendor infoframes and 4k modes
    lots of gem/prime locking and races fixes
    async pageflip scaffolding
    drm bridge objects

    - i915:

    Haswell PC8+ support and eLLC support, HDMI 4K support, initial
    per-process VMA pieces, watermark reworks, convert to generic hdmi
    infoframes, encoder reworking, fastboot support,

    - radeon:

    CIK PM support, remove 3d blit code in favour of DMA engines,
    Berlin GPU support, HDMI audio fixes

    - nouveau:

    secondary GPU power down support for optimus laptops, lots of
    fixes, use MSI, VP3 engine support

    - exynos:

    runtime pm support for g2d, DT support, remove non-DT,

    - tda998x i2c driver:

    lots of fixes for sync issues

    - gma500:

    lots of cleanups

    - rcar:

    add LVDS support, fbdev emulation,

    - tegra:

    just minor fixes"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (684 commits)
    drm/exynos: Fix build error with exynos_drm_connector.c
    drm/exynos: Remove non-DT support in exynos_drm_fimd
    drm/exynos: Remove non-DT support in exynos_hdmi
    drm/exynos: Remove non-DT support in exynos_drm_g2d
    drm/exynos: Remove non-DT support in exynos_hdmiphy
    drm/exynos: Remove non-DT support in exynos_ddc
    drm/exynos: Make Exynos DRM drivers depend on OF
    drm/exynos: Consider fallback option to allocation fail
    drm/exynos: fimd: move platform data parsing to separate function
    drm/exynos: fimd: get signal polarities from device tree
    drm/exynos: fimd: replace struct fb_videomode with videomode
    drm/exynos: check a pixel format to a particular window layer
    drm/exynos: fix fimd pixel format setting
    drm/exynos: Add NULL pointer check
    drm/exynos: Remove redundant error messages
    drm/exynos: Add missing of.h header include
    drm/exynos: Remove redundant NULL check in exynos_drm_buf
    drm/exynos: add device tree support for rotator
    drm/exynos: Add missing includes
    drm/exynos: add runtime pm interfaces to g2d driver
    ...

    Linus Torvalds
     
  • Pull fbdev changes from Tomi Valkeinen:
    - Improvements to da8xx-fb to make it support v2 of the LCDC IP, used
    eg in BeagleBone
    - Himax HX8369 controller support
    - Various small fixes and cleanups

    * tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
    video: da8xx-fb: fix the polarities of the hsync/vsync pulse
    video: da8xx-fb: support lcdc v2 timing register expansion
    video: da8xx-fb: fixing timing off by one errors
    video: da8xx-fb fixing incorrect porch mappings
    video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource
    fbmem: move EXPORT_SYMBOL annotation next to symbol declarations
    drivers: video: fbcmap: remove the redundency and incorrect checkings
    video: mxsfb: simplify use of devm_ioremap_resource
    Release efifb's colormap in efifb_destroy()
    at91/avr32/atmel_lcdfb: prepare clk before calling enable
    video: exynos: Ensure definitions match prototypes
    OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file
    OMAPDSS: HDMI: Fix possible NULL reference
    video: da8xx-fb: adding am33xx as dependency
    video: da8xx-fb: let compiler decide what to inline
    video: da8xx-fb: make clock naming consistent
    video: da8xx-fb: set upstream clock rate (if reqd)
    video: da8xx-fb: reorganize panel detection
    video: da8xx-fb: ensure non-null cfg in pdata
    video: da8xx-fb: use devres
    ...

    Linus Torvalds
     
  • Pull i2c updates from Wolfram Sang:
    "Highlights:

    - OF and ACPI helpers are now included in the core, and not in
    external files anymore. This removes dependency problems for
    modules and is cleaner, in general.
    - mv64xxx-driver gains fifo usage to support mv78230
    - imx-driver overhaul to support VF610
    - various cleanups, most notably related to devm_* and CONFIG_PM
    usage
    - driver bugfixes and smaller feature additions"

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (51 commits)
    i2c: rcar: add rcar-H2 support
    i2c: sirf: retry 3 times as sometimes we get random noack and timeout
    i2c: sirf: support reverse direction of address
    i2c: sirf: fix the typo for setting bitrate to less than 100k
    i2c: sirf: we need to wait I2C_RESET status in resume
    i2c: sirf: reset i2c controller early after we get a noack
    i2c: designware: get SDA hold time, HCNT and LCNT configuration from ACPI
    i2c: designware: make HCNT/LCNT values configurable
    i2c: mpc: cleanup clock API use
    i2c: pnx: fix error return code in i2c_pnx_probe()
    i2c: ismt: add error return code in probe()
    i2c: mv64xxx: fix typo in binding documentation
    i2c: imx: use exact SoC revision to document binding
    i2c: move ACPI helpers into the core
    i2c: move OF helpers into the core
    i2c: mv64xxx: Fix timing issue on Armada XP (errata FE-8471889)
    i2c: mv64xxx: Add I2C Transaction Generator support
    i2c: powermac: fix return path on error
    Documentation: i2c: Fix example in instantiating-devices
    i2c: tiny-usb: do not use stack as URB transfer_buffer
    ...

    Linus Torvalds
     
  • The current description of DTB placement requirements does not quite
    match the kernel code in head.S: __vet_fdt and __create_page_tables.
    This patch tweaks the text to match the actual requirements placed on
    it by the code.

    Signed-off-by: Mark Salter
    Acked-by: Will Deacon
    Signed-off-by: Catalin Marinas

    Mark Salter
     

05 Sep, 2013

4 commits

  • Pull vfs pile 1 from Al Viro:
    "Unfortunately, this merge window it'll have a be a lot of small piles -
    my fault, actually, for not keeping #for-next in anything that would
    resemble a sane shape ;-/

    This pile: assorted fixes (the first 3 are -stable fodder, IMO) and
    cleanups + %pd/%pD formats (dentry/file pathname, up to 4 last
    components) + several long-standing patches from various folks.

    There definitely will be a lot more (starting with Miklos'
    check_submount_and_drop() series)"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
    direct-io: Handle O_(D)SYNC AIO
    direct-io: Implement generic deferred AIO completions
    add formats for dentry/file pathnames
    kvm eventfd: switch to fdget
    powerpc kvm: use fdget
    switch fchmod() to fdget
    switch epoll_ctl() to fdget
    switch copy_module_from_fd() to fdget
    git simplify nilfs check for busy subtree
    ibmasmfs: don't bother passing superblock when not needed
    don't pass superblock to hypfs_{mkdir,create*}
    don't pass superblock to hypfs_diag_create_files
    don't pass superblock to hypfs_vm_create_files()
    oprofile: get rid of pointless forward declarations of struct super_block
    oprofilefs_create_...() do not need superblock argument
    oprofilefs_mkdir() doesn't need superblock argument
    don't bother with passing superblock to oprofile_create_stats_files()
    oprofile: don't bother with passing superblock to ->create_files()
    don't bother passing sb to oprofile_create_files()
    coh901318: don't open-code simple_read_from_buffer()
    ...

    Linus Torvalds
     
  • Russell King
     
  • From Anatolij:
    <<
    There are cleanups for some mpc5121 specific drivers and DTS files
    in preparation to switch mpc5121 clock support to a clock driver
    based on common clock framework. Additionally Sebastian fixed the
    mpc52xx PIC driver so that it builds when using older gcc versions.
    >>

    Benjamin Herrenschmidt
     
  • The exynos4 platform is only dt-based since 3.10, we should convert driver data
    and ids to dt-based parsing methods. The rotator driver has a limit table to get
    size limit of input picture. Each SoCs has slightly different limit value
    compared with any others.
    For example, exynos4210's max_size of RGB888 is 16k x 16k. But, others have
    8k x 8k. Another example the exynos5250 should have multiple of 2 pixel size
    for its X/Y axis. Thus, we should keep different tables for each of them.
    This patch also includes desciptions of each nodes for the rotator and specifies
    a example how to bind it.

    Signed-off-by: Chanho Park
    Signed-off-by: Kyungmin Park
    Signed-off-by: Inki Dae

    Chanho Park