27 Oct, 2014

2 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "Another week, another small batch of fixes.

    Most of these make zynq, socfpga and sunxi platforms work a bit
    better:

    - due to new requirements for regulators, DWMMC on socfpga broke past
    v3.17
    - SMP spinup fix for socfpga
    - a few DT fixes for zynq
    - another option (FIXED_REGULATOR) for sunxi is needed that used to
    be selected by other options but no longer is.
    - a couple of small DT fixes for at91
    - ...and a couple for i.MX"

    * tag 'armsoc-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: dts: imx28-evk: Let i2c0 run at 100kHz
    ARM: i.MX6: Fix "emi" clock name typo
    ARM: multi_v7_defconfig: enable CONFIG_MMC_DW_ROCKCHIP
    ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
    ARM: dts: socfpga: Add a 3.3V fixed regulator node
    ARM: dts: socfpga: Fix SD card detect
    ARM: dts: socfpga: rename gpio nodes
    ARM: at91/dt: sam9263: fix PLLB frequencies
    power: reset: at91-reset: fix power down register
    MAINTAINERS: add atmel ssc driver maintainer entry
    arm: socfpga: fix fetching cpu1start_addr for SMP
    ARM: zynq: DT: trivial: Fix mc node
    ARM: zynq: DT: Add cadence watchdog node
    ARM: zynq: DT: Add missing reference for memory-controller
    ARM: zynq: DT: Add missing reference for ADC
    ARM: zynq: DT: Add missing address for L2 pl310
    ARM: zynq: DT: Remove 222 MHz OPP
    ARM: zynq: DT: Fix GEM register area size

    Linus Torvalds
     
  • Pull vfs updates from Al Viro:
    "overlayfs merge + leak fix for d_splice_alias() failure exits"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    overlayfs: embed middle into overlay_readdir_data
    overlayfs: embed root into overlay_readdir_data
    overlayfs: make ovl_cache_entry->name an array instead of pointer
    overlayfs: don't hold ->i_mutex over opening the real directory
    fix inode leaks on d_splice_alias() failure exits
    fs: limit filesystem stacking depth
    overlay: overlay filesystem documentation
    overlayfs: implement show_options
    overlayfs: add statfs support
    overlay filesystem
    shmem: support RENAME_WHITEOUT
    ext4: support RENAME_WHITEOUT
    vfs: add RENAME_WHITEOUT
    vfs: add whiteout support
    vfs: export check_sticky()
    vfs: introduce clone_private_mount()
    vfs: export __inode_permission() to modules
    vfs: export do_splice_direct() to modules
    vfs: add i_op->dentry_open()

    Linus Torvalds
     

24 Oct, 2014

1 commit


22 Oct, 2014

3 commits

  • Signed-off-by: Bo Shen
    Acked-by: Nicolas Ferre

    Bo Shen
     
  • Pull email address change from Boaz Harrosh.

    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
    Boaz Harrosh - fix email in Documentation
    Boaz Harrosh - Fix broken email address
    MAINTAINERS: Change Boaz Harrosh's email

    Linus Torvalds
     
  • Pull mailbox framework from Jassi Brar:
    "A framework for Mailbox controllers and clients have been cooking for
    more than a year now.

    Everybody in the CC list had been copied on patchset revisions and
    most of them have made sounds of approval, though just one concrete
    Reviewed-by. The patchset has also been in linux-next for a couple of
    weeks now and no conflict has been reported. The framework has the
    backing of at least 5 platforms, though I can't say if/when they
    upstream their drivers (some businesses have 'changed')"

    (Further acked-by by Arnd Bergmann and Suman Anna in the pull request
    thread)

    * 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
    dt: mailbox: add generic bindings
    doc: add documentation for mailbox framework
    mailbox: Introduce framework for mailbox
    mailbox: rename pl320-ipc specific mailbox.h

    Linus Torvalds
     

20 Oct, 2014

4 commits

  • Pull ARM SoC fixes from Olof Johansson:
    "A batch of fixes that have come in during the merge window.

    Some of them are defconfig updates for things that have now landed,
    some errata additions and a few general scattered fixes.

    There's also a qcom DT update that adds support for SATA on AP148, and
    basic support for Sony Xperia Z1 and CM-QS600 platforms that seemed
    isolated enough that we could merge it even if it's late"

    * tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    MAINTAINERS: corrected bcm2835 search
    ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
    ARM: dts: Explicitly set dr_mode on exynos Peach boards
    ARM: dts: qcom: add CM-QS600 board
    ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
    ARM: dts: qcom: Add SATA support on IPQ8064/AP148
    MAINTAINERS: Update Santosh Shilimkar's email id
    ARM: sunxi_defconfig: enable CONFIG_REGULATOR
    ARM: dts: Disable smc91x on n900 until bootloader dependency is removed
    ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3
    ARM: exynos_defconfig: enable USB gadget support
    ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers
    ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
    ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
    ARM: SAMSUNG: Restore Samsung PM Debug functionality
    ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
    ARM: exynos_defconfig: Enable SBS battery support
    ARM: exynos_defconfig: Enable Control Groups support
    ARM: exynos_defconfig: Enable Atmel maXTouch support
    ARM: exynos_defconfig: Enable MAX77802

    Linus Torvalds
     
  • Corrected bcm2835 maintainer info by using N: to specify any files with
    bcm2835 in are directed to the proper maintainer.
    Also corrected minor mispelling of ARCHITECTURE in 2 comment locations.

    Signed-off-by: Scott Branden
    Signed-off-by: Stephen Warren
    Signed-off-by: Olof Johansson

    Scott Branden
     
  • Pull infiniband/RDMA updates from Roland Dreier:
    - large set of iSER initiator improvements
    - hardware driver fixes for cxgb4, mlx5 and ocrdma
    - small fixes to core midlayer

    * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (47 commits)
    RDMA/cxgb4: Fix ntuple calculation for ipv6 and remove duplicate line
    RDMA/cxgb4: Add missing neigh_release in find_route
    RDMA/cxgb4: Take IPv6 into account for best_mtu and set_emss
    RDMA/cxgb4: Make c4iw_wr_log_size_order static
    IB/core: Fix XRC race condition in ib_uverbs_open_qp
    IB/core: Clear AH attr variable to prevent garbage data
    RDMA/ocrdma: Save the bit environment, spare unncessary parenthesis
    RDMA/ocrdma: The kernel has a perfectly good BIT() macro - use it
    RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
    RDMA/ocrdma: Remove a unused-label warning
    RDMA/ocrdma: Convert kernel VA to PA for mmap in user
    RDMA/ocrdma: Get vlan tag from ib_qp_attrs
    RDMA/ocrdma: Add default GID at index 0
    IB/mlx5, iser, isert: Add Signature API additions
    Target/iser: Centralize ib_sig_domain setting
    IB/iser: Centralize ib_sig_domain settings
    IB/mlx5: Use extended internal signature layout
    IB/iser: Set IP_CSUM as default guard type
    IB/iser: Remove redundant assignment
    IB/mlx5: Use enumerations for PI copy mask
    ...

    Linus Torvalds
     
  • I have moved on, and do no longer have Panasas email access.
    Update to an email that can reach me.

    So change bharrosh@panasas.com => ooo@electrozaur.com

    Explain of email address:
    * electrozaur.com is a domain owned by me.
    * ooo - Stands for Open Osd . Org

    Another email alias that can be used is:
    openosd@gmail.com

    CC: Greg KH
    Signed-off-by: Boaz Harrosh

    Boaz Harrosh
     

19 Oct, 2014

4 commits

  • Pull slave-dmaengine updates from Vinod Koul:
    "For dmaengine contributions we have:
    - designware cleanup by Andy
    - my series moving device_control users to dmanegine_xxx APIs for
    later removal of device_control API
    - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
    etc"

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
    serial: atmel: add missing dmaengine header
    dmaengine: remove FSLDMA_EXTERNAL_START
    dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
    carma-fpga: move to fsl_dma_external_start()
    carma-fpga: use dmaengine_xxx() API
    dmaengine: freescale: add and export fsl_dma_external_start()
    dmaengine: add dmaengine_prep_dma_sg() helper
    video: mx3fb: use dmaengine_terminate_all() API
    serial: sh-sci: use dmaengine_terminate_all() API
    net: ks8842: use dmaengine_terminate_all() API
    mtd: sh_flctl: use dmaengine_terminate_all() API
    mtd: fsmc_nand: use dmaengine_terminate_all() API
    V4L2: mx3_camer: use dmaengine_pause() API
    dmaengine: coh901318: use dmaengine_terminate_all() API
    pata_arasan_cf: use dmaengine_terminate_all() API
    dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
    dmaengine: dw: export probe()/remove() and Co to users
    dmaengine: dw: enable and disable controller when needed
    dmaengine: dw: always export dw_dma_{en,dis}able
    dmaengine: dw: introduce dw_dma_on() helper
    ...

    Linus Torvalds
     
  • Pull MTD update from Brian Norris:
    "Sorry for delaying this a bit later than usual. There's one mild
    regression from 3.16 that was noticed during the 3.17 cycle, and I
    meant to send a fix for it along with this pull request. I'll
    probably try to queue it up for a later pull request once I've had a
    better look at it, hopefully by -rc2 at the latest.

    Summary for this pull:

    NAND
    - Cleanup for Denali driver
    - Atmel: add support for new page sizes
    - Atmel: fix up 'raw' mode support
    - Atmel: miscellaneous cleanups
    - New timing mode helpers for non-ONFI NAND
    - OMAP: allow driver to be (properly) built as a module
    - bcm47xx: RESET support and other cleanups

    SPI NOR
    - Miscellaneous cleanups, to prepare framework for wider use (some
    further work still pending)
    - Compile-time configuration to select 4K vs. 64K support for flash
    that support both (necessary for using UBIFS on some SPI NOR)

    A few scattered code quality fixes, detected by Coverity

    See the changesets for more"

    * tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd: (59 commits)
    mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message
    mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module
    mtd: move support for struct flash_platform_data into m25p80
    mtd: spi-nor: add Kconfig option to disable 4K sectors
    mtd: nand: Move ELM driver and rename as omap_elm
    nand: omap2: Replace pr_err with dev_err
    nand: omap2: Remove horrible ifdefs to fix module probe
    mtd: nand: add Hynix's H27UCG8T2ATR-BC to nand_ids table
    mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs
    mtd: physmap_of: Add non-obsolete map_rom probe
    mtd: physmap_of: Fix ROM support via OF
    MAINTAINERS: add l2-mtd.git, 'next' tree for MTD
    mtd: denali: fix indents and other trivial things
    mtd: denali: remove unnecessary parentheses
    mtd: denali: remove another set-but-unused variable
    mtd: denali: fix include guard and license block of denali.h
    mtd: nand: don't break long print messages
    mtd: bcm47xxnflash: replace some magic numbers
    mtd: bcm47xxnflash: NAND_CMD_RESET support
    mtd: bcm47xxnflash: add cmd_ctrl handler
    ...

    Linus Torvalds
     
  • It seems it's my turn to be the documentation maintainer for a bit. My
    plan is to work to ensure that docs patches don't fall through the cracks;
    I assume most changes will continue to flow through subsystem-specific
    trees.

    Acked-by: Jiri Kosina
    Signed-off-by: Jonathan Corbet
    Signed-off-by: Linus Torvalds

    Jonathan Corbet
     
  • Pull networking fixes from David Miller:

    1) Include fixes for netrom and dsa (Fabian Frederick and Florian
    Fainelli)

    2) Fix FIXED_PHY support in stmmac, from Giuseppe CAVALLARO.

    3) Several SKB use after free fixes (vxlan, openvswitch, vxlan,
    ip_tunnel, fou), from Li ROngQing.

    4) fec driver PTP support fixes from Luwei Zhou and Nimrod Andy.

    5) Use after free in virtio_net, from Michael S Tsirkin.

    6) Fix flow mask handling for megaflows in openvswitch, from Pravin B
    Shelar.

    7) ISDN gigaset and capi bug fixes from Tilman Schmidt.

    8) Fix route leak in ip_send_unicast_reply(), from Vasily Averin.

    9) Fix two eBPF JIT bugs on x86, from Alexei Starovoitov.

    10) TCP_SKB_CB() reorganization caused a few regressions, fixed by Cong
    Wang and Eric Dumazet.

    11) Don't overwrite end of SKB when parsing malformed sctp ASCONF
    chunks, from Daniel Borkmann.

    12) Don't call sock_kfree_s() with NULL pointers, this function also has
    the side effect of adjusting the socket memory usage. From Cong Wang.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits)
    bna: fix skb->truesize underestimation
    net: dsa: add includes for ethtool and phy_fixed definitions
    openvswitch: Set flow-key members.
    netrom: use linux/uaccess.h
    dsa: Fix conversion from host device to mii bus
    tipc: fix bug in bundled buffer reception
    ipv6: introduce tcp_v6_iif()
    sfc: add support for skb->xmit_more
    r8152: return -EBUSY for runtime suspend
    ipv4: fix a potential use after free in fou.c
    ipv4: fix a potential use after free in ip_tunnel_core.c
    hyperv: Add handling of IP header with option field in netvsc_set_hash()
    openvswitch: Create right mask with disabled megaflows
    vxlan: fix a free after use
    openvswitch: fix a use after free
    ipv4: dst_entry leak in ip_send_unicast_reply()
    ipv4: clean up cookie_v4_check()
    ipv4: share tcp_v4_save_options() with cookie_v4_check()
    ipv4: call __ip_options_echo() in cookie_v4_check()
    atm: simplify lanai.c by using module_pci_driver
    ...

    Linus Torvalds
     

15 Oct, 2014

3 commits

  • Signed-off-by: Santosh Shilimkar
    Signed-off-by: Olof Johansson

    Santosh Shilimkar
     
  • Pull MFD updates from Lee Jones:
    "Changes to existing drivers:
    - DT clean-ups in da9055-core, max14577, rn5t618, arizona, hi6421, stmpe, twl4030
    - Export symbols for use in modules in max14577
    - Plenty of static code analysis/Coccinelle fixes throughout the SS
    - Regmap clean-ups in arizona, wm5102, wm5110, da9052, tps65217, rk808
    - Remove unused/duplicate code in da9052, 88pm860x, ti_ssp, lpc_sch, arizona
    - Bug fixes in ti_am335x_tscadc, da9052, ti_am335x_tscadc, rtsx_pcr
    - IRQ fixups in arizona, stmpe, max14577
    - Regulator related changes in axp20x
    - Pass DMA coherency information from parent => child in MFD core
    - Rename DT document files for consistency
    - Add ACPI support to the MFD core
    - Add Andreas Werner to MAINTAINERS for MEN F21BMC

    New drivers/supported devices:
    - New driver for MEN 14F021P00 Board Management Controller
    - New driver for Ricoh RN5T618 PMIC
    - New driver for Rockchip RK808
    - New driver for HiSilicon Hi6421 PMIC
    - New driver for Qualcomm SPMI PMICs
    - Add support for Intel Braswell in lpc_ich
    - Add support for Intel 9 Series PCH in lpc_ich
    - Add support for Intel Quark ILB in lpc_sch"

    [ Delayed to after the poweer/reset pull due to Kconfig problems with
    recursive Kconfig select/depends-on chains. - Linus ]

    * tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (79 commits)
    mfd: cros_ec: wait for completion of commands that return IN_PROGRESS
    i2c: i2c-cros-ec-tunnel: Set retries to 3
    mfd: cros_ec: move locking into cros_ec_cmd_xfer
    mfd: cros_ec: stop calling ->cmd_xfer() directly
    mfd: cros_ec: Delay for 50ms when we see EC_CMD_REBOOT_EC
    MAINTAINERS: Adds Andreas Werner to maintainers list for MEN F21BMC
    mfd: arizona: Correct mask to allow setting micbias external cap
    mfd: Add ACPI support
    Revert "mfd: wm5102: Manually apply register patch"
    mfd: ti_am335x_tscadc: Update logic in CTRL register for 5-wire TS
    mfd: dt-bindings: atmel-gpbr: Rename doc file to conform to naming convention
    mfd: dt-bindings: qcom-pm8xxx: Rename doc file to conform to naming convention
    mfd: Inherit coherent_dma_mask from parent device
    mfd: Document DT bindings for Qualcomm SPMI PMICs
    mfd: Add support for Qualcomm SPMI PMICs
    mfd: dt-bindings: pm8xxx: Add new compatible string
    mfd: axp209x: Drop the parent supplies field
    mfd: twl4030-power: Use 'ti,system-power-controller' as alternative way to support system power off
    mfd: dt-bindings: twl4030-power: Use the standard property to mark power control
    mfd: syscon: Add Atmel GPBR DT bindings documention
    ...

    Linus Torvalds
     
  • Signed-off-by: Vince Bridgers
    Signed-off-by: David S. Miller

    Vince Bridgers
     

14 Oct, 2014

8 commits

  • Pull drm updates from Dave Airlie:
    "This is the main git pull for the drm,

    I pretty much froze major pulls at -rc5/6 time, and haven't had much
    fallout, so will probably continue doing that.

    Lots of changes all over, big internal header cleanup to make it clear
    drm features are legacy things and what are things that modern KMS
    drivers should be using. Also big move to use the new generic fences
    in all the TTM drivers.

    core:
    atomic prep work,
    vblank rework changes, allows immediate vblank disables
    major header reworking and cleanups to better delinate legacy
    interfaces from what KMS drivers should be using.
    cursor planes locking fixes

    ttm:
    move to generic fences (affects all TTM drivers)
    ppc64 caching fixes

    radeon:
    userptr support,
    uvd for old asics,
    reset rework for fence changes
    better buffer placement changes,
    dpm feature enablement
    hdmi audio support fixes

    intel:
    Cherryview work,
    180 degree rotation,
    skylake prep work,
    execlist command submission
    full ppgtt prep work
    cursor improvements
    edid caching,
    vdd handling improvements

    nouveau:
    fence reworking
    kepler memory clock work
    gt21x clock work
    fan control improvements
    hdmi infoframe fixes
    DP audio

    ast:
    ppc64 fixes
    caching fix

    rcar:
    rcar-du DT support

    ipuv3:
    prep work for capture support

    msm:
    LVDS support for mdp4, new panel, gpu refactoring

    exynos:
    exynos3250 SoC support, drop bad mmap interface,
    mipi dsi changes, and component match support"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
    drm/mst: rework payload table allocation to conform better.
    drm/ast: Fix HW cursor image
    drm/radeon/kv: add uvd/vce info to dpm debugfs output
    drm/radeon/ci: add uvd/vce info to dpm debugfs output
    drm/radeon: export reservation_object from dmabuf to ttm
    drm/radeon: cope with foreign fences inside the reservation object
    drm/radeon: cope with foreign fences inside display
    drm/core: use helper to check driver features
    drm/radeon/cik: write gfx ucode version to ucode addr reg
    drm/radeon/si: print full CS when we hit a packet 0
    drm/radeon: remove unecessary includes
    drm/radeon/combios: declare legacy_connector_convert as static
    drm/radeon/atombios: declare connector convert tables as static
    drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
    drm/radeon/dpm: drop clk/voltage dependency filters for BTC
    drm/radeon/dpm: drop clk/voltage dependency filters for CI
    drm/radeon/dpm: drop clk/voltage dependency filters for SI
    drm/radeon/dpm: drop clk/voltage dependency filters for NI
    drm/radeon: disable audio when we disable hdmi (v2)
    drm/radeon: split audio enable between eg and r600 (v2)
    ...

    Linus Torvalds
     
  • This removes Chirag Kantharia from the MAINTAINERS file, as his e-mail
    address is now rejected by the HP mail server.

    Make the driver "Orphan" until he gets back with a working e-mail address
    or a new maintainer steps in.

    Signed-off-by: Michael Opdenacker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Opdenacker
     
  • Update the maintenance status for m32r

    - Removing Hirokazu Takata as maintainer
    (last commit merged: Nov. 2009)

    - Remove mailing lists that no longer exist,
    as the ml.linux-m32r.org subdomain no longer exists.

    - Maintenance status moved to "Orphan"

    Signed-off-by: Michael Opdenacker
    Acked-by: Hirokazu Takata
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Opdenacker
     
  • Add an entry in MAINTAINERS file for ATMEL nand driver.

    Signed-off-by: Josh Wu
    Acked-by: Nicolas Ferre
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Josh Wu
     
  • Add entry for Kernel Selftest Framework. Individual tests continue to be
    maintained by the maintainers for those areas.

    Signed-off-by: Shuah Khan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shuah Khan
     
  • Previous patch is awaiting moderator approval for posting to this mailing
    list.

    Signed-off-by: Randy Dunlap
    Cc: Sumit Semwal
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Inspired by some recent cleanups in MAINTAINERS the following files (F:)
    cannot be found any more in the tree:

    * arch/arm/mach-s5pv210/mach-aquila.c
    * arch/arm/mach-s5pv210/mach-goni.c

    Those two got removed in commit 28c8331d386a ("ARM: S5PV210: Remove
    support for board files").

    Cc: Tomasz Figa
    Cc: Kyungmin Park

    * drivers/rtc/rtc-sec.c

    A MAINTAINERS fix was attempted in November 2012, but dismissed as
    rtc-sec.c was still being worked on. Alas, it's still not there.

    "MAINTAINERS: fix drivers/rtc/rtc-sec.c"
    http://lkml.iu.edu/hypermail/linux/kernel/1211.2/04820.html
    Cc: Sangbeom Kim
    Cc: Cesar Eduardo Barros

    Signed-off-by: Christian Kujau
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christian Kujau
     
  • Assign systemace driver to Xilinx Zynq to ensure if there is a change that
    someone can even test it.

    Signed-off-by: Michal Simek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michal Simek
     

13 Oct, 2014

1 commit

  • Pull core locking updates from Ingo Molnar:
    "The main updates in this cycle were:

    - mutex MCS refactoring finishing touches: improve comments, refactor
    and clean up code, reduce debug data structure footprint, etc.

    - qrwlock finishing touches: remove old code, self-test updates.

    - small rwsem optimization

    - various smaller fixes/cleanups"

    * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    locking/lockdep: Revert qrwlock recusive stuff
    locking/rwsem: Avoid double checking before try acquiring write lock
    locking/rwsem: Move EXPORT_SYMBOL() lines to follow function definition
    locking/rwlock, x86: Delete unused asm/rwlock.h and rwlock.S
    locking/rwlock, x86: Clean up asm/spinlock*.h to remove old rwlock code
    locking/semaphore: Resolve some shadow warnings
    locking/selftest: Support queued rwlock
    locking/lockdep: Restrict the use of recursive read_lock() with qrwlock
    locking/spinlocks: Always evaluate the second argument of spin_lock_nested()
    locking/Documentation: Update locking/mutex-design.txt disadvantages
    locking/Documentation: Move locking related docs into Documentation/locking/
    locking/mutexes: Use MUTEX_SPIN_ON_OWNER when appropriate
    locking/mutexes: Refactor optimistic spinning code
    locking/mcs: Remove obsolete comment
    locking/mutexes: Document quick lock release when unlocking
    locking/mutexes: Standardize arguments in lock/unlock slowpaths
    locking: Remove deprecated smp_mb__() barriers

    Linus Torvalds
     

12 Oct, 2014

5 commits

  • Pull security subsystem updates from James Morris.

    Mostly ima, selinux, smack and key handling updates.

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
    integrity: do zero padding of the key id
    KEYS: output last portion of fingerprint in /proc/keys
    KEYS: strip 'id:' from ca_keyid
    KEYS: use swapped SKID for performing partial matching
    KEYS: Restore partial ID matching functionality for asymmetric keys
    X.509: If available, use the raw subjKeyId to form the key description
    KEYS: handle error code encoded in pointer
    selinux: normalize audit log formatting
    selinux: cleanup error reporting in selinux_nlmsg_perm()
    KEYS: Check hex2bin()'s return when generating an asymmetric key ID
    ima: detect violations for mmaped files
    ima: fix race condition on ima_rdwr_violation_check and process_measurement
    ima: added ima_policy_flag variable
    ima: return an error code from ima_add_boot_aggregate()
    ima: provide 'ima_appraise=log' kernel option
    ima: move keyring initialization to ima_init()
    PKCS#7: Handle PKCS#7 messages that contain no X.509 certs
    PKCS#7: Better handling of unsupported crypto
    KEYS: Overhaul key identification when searching for asymmetric keys
    KEYS: Implement binary asymmetric key ID handling
    ...

    Linus Torvalds
     
  • Pull ftrace test code from Steven Rostedt:
    "This patch series starts a new selftests section in the
    tools/testing/selftest directory called "ftrace" that holds tests
    aimed at testing ftrace and subsystems that use ftrace (like kprobes).

    So far only a few tests were written (by Masami Hiramatsu), but more
    will be added in the near future (3.19)"

    * tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
    tracing/kprobes: Add selftest scripts testing kprobe-tracer as startup test
    ftracetest: Add POSIX.3 standard and XFAIL result codes
    ftracetest: Add kprobe basic testcases
    ftracetest: Add ftrace basic testcases
    ftracetest: Initial commit for ftracetest

    Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "This set fixes a bunch of fallout from the changes that went in during
    this merge window, particularly:

    - Fix fsl_pq_mdio (Claudiu Manoil) and fm10k (Pranith Kumar) build
    failures.

    - Several networking drivers do atomic_set() on page counts where
    that's not exactly legal. From Eric Dumazet.

    - Make __skb_flow_get_ports() work cleanly with unaligned data, from
    Alexander Duyck.

    - Fix some kernel-doc buglets in rfkill and netlabel, from Fabian
    Frederick.

    - Unbalanced enable_irq_wake usage in bcmgenet and systemport
    drivers, from Florian Fainelli.

    - pxa168_eth needs to depend on HAS_DMA, from Geert Uytterhoeven.

    - Multi-dequeue in the qdisc layer severely bypasses the fairness
    limits the previous code used to enforce, reintroduce in a way that
    at the same time doesn't compromise bulk dequeue opportunities.
    From Jesper Dangaard Brouer.

    - macvlan receive path unnecessarily hops through a softirq by using
    netif_rx() instead of netif_receive_skb(). From Jason Baron"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (51 commits)
    net: systemport: avoid unbalanced enable_irq_wake calls
    net: bcmgenet: avoid unbalanced enable_irq_wake calls
    net: bcmgenet: fix off-by-one in incrementing read pointer
    net: fix races in page->_count manipulation
    mlx4: fix race accessing page->_count
    ixgbe: fix race accessing page->_count
    igb: fix race accessing page->_count
    fm10k: fix race accessing page->_count
    net/phy: micrel: Add clock support for KSZ8021/KSZ8031
    flow-dissector: Fix alignment issue in __skb_flow_get_ports
    net: filter: fix the comments
    Documentation: replace __sk_run_filter with __bpf_prog_run
    macvlan: optimize the receive path
    macvlan: pass 'bool' type to macvlan_count_rx()
    drivers: net: xgene: Add 10GbE ethtool support
    drivers: net: xgene: Add 10GbE support
    drivers: net: xgene: Preparing for adding 10GbE support
    dtb: Add 10GbE node to APM X-Gene SoC device tree
    Documentation: dts: Update section header for APM X-Gene
    MAINTAINERS: Update APM X-Gene section
    ...

    Linus Torvalds
     
  • Pull powerpc updates from Michael Ellerman:
    "Here's a first pull request for powerpc updates for 3.18.

    The bulk of the additions are for the "cxl" driver, for IBM's Coherent
    Accelerator Processor Interface (CAPI). Most of it's in drivers/misc,
    which Greg & Arnd maintain, Greg said he was happy for us to take it
    through our tree.

    There's the usual minor cleanups and fixes, including a bit of noise
    in drivers from some of those. A bunch of updates to our EEH code,
    which has been getting more testing. Several nice speedups from
    Anton, including 20% in clear_page().

    And a bunch of updates for freescale from Scott"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (130 commits)
    cxl: Fix afu_read() not doing finish_wait() on signal or non-blocking
    cxl: Add documentation for userspace APIs
    cxl: Add driver to Kbuild and Makefiles
    cxl: Add userspace header file
    cxl: Driver code for powernv PCIe based cards for userspace access
    cxl: Add base builtin support
    powerpc/mm: Add hooks for cxl
    powerpc/opal: Add PHB to cxl mode call
    powerpc/mm: Add new hash_page_mm()
    powerpc/powerpc: Add new PCIe functions for allocating cxl interrupts
    cxl: Add new header for call backs and structs
    powerpc/powernv: Split out set MSI IRQ chip code
    powerpc/mm: Export mmu_kernel_ssize and mmu_linear_psize
    powerpc/msi: Improve IRQ bitmap allocator
    powerpc/cell: Make spu_flush_all_slbs() generic
    powerpc/cell: Move data segment faulting code out of cell platform
    powerpc/cell: Move spu_handle_mm_fault() out of cell platform
    powerpc/pseries: Use new defines when calling H_SET_MODE
    powerpc: Update contact info in Documentation files
    powerpc/perf/hv-24x7: Simplify catalog_read()
    ...

    Linus Torvalds
     
  • Pull Xen updates from David Vrabel:
    "Features and fixes:

    - Add pvscsi frontend and backend drivers.
    - Remove _PAGE_IOMAP PTE flag, freeing it for alternate uses.
    - Try and keep memory contiguous during PV memory setup (reduces
    SWIOTLB usage).
    - Allow front/back drivers to use threaded irqs.
    - Support large initrds in PV guests.
    - Fix PVH guests in preparation for Xen 4.5"

    * tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (22 commits)
    xen: remove DEFINE_XENBUS_DRIVER() macro
    xen/xenbus: Remove BUG_ON() when error string trucated
    xen/xenbus: Correct the comments for xenbus_grant_ring()
    x86/xen: Set EFER.NX and EFER.SCE in PVH guests
    xen: eliminate scalability issues from initrd handling
    xen: sync some headers with xen tree
    xen: make pvscsi frontend dependant on xenbus frontend
    arm{,64}/xen: Remove "EXPERIMENTAL" in the description of the Xen options
    xen-scsifront: don't deadlock if the ring becomes full
    x86: remove the Xen-specific _PAGE_IOMAP PTE flag
    x86/xen: do not use _PAGE_IOMAP PTE flag for I/O mappings
    x86: skip check for spurious faults for non-present faults
    xen/efi: Directly include needed headers
    xen-scsiback: clean up a type issue in scsiback_make_tpg()
    xen-scsifront: use GFP_ATOMIC under spin_lock
    MAINTAINERS: Add xen pvscsi maintainer
    xen-scsiback: Add Xen PV SCSI backend driver
    xen-scsifront: Add Xen PV SCSI frontend driver
    xen: Add Xen pvSCSI protocol description
    xen/events: support threaded irqs for interdomain event channels
    ...

    Linus Torvalds
     

11 Oct, 2014

4 commits

  • Pull MMC updates from Ulf Hansson:
    "MMC core:
    - Fix SDIO IRQ bug
    - MMC regulator improvements
    - Fix slot-gpio card detect bug
    - Add support for Driver Stage Register
    - Convert the common MMC OF parser to use GPIO descriptors
    - Convert MMC_CAP2_NO_MULTI_READ into a callback, ->multi_io_quirk()
    - Some additional minor fixes

    MMC host:
    - mmci: Support Qualcomm specific DML layer for DMA
    - dw_mmc: Use common MMC regulators
    - dw_mmc: Add support for Rock-chips RK3288
    - tmio: Enable runtime PM support
    - tmio: Add support for R-Car Gen2 SoCs
    - tmio: Several fixes and improvements
    - omap_hsmmc: Removed Balaji from MAINTAINERS
    - jz4740: add DMA and pre/post support
    - sdhci: Add support for Intel Braswell
    - sdhci: Several fixes and improvements"

    * tag 'mmc-v3.18-1' of git://git.linaro.org/people/ulf.hansson/mmc: (119 commits)
    ARM: dts: fix MMC2 regulators for Exynos5420 Arndale Octa board
    mmc: sdhci-acpi: Fix Braswell eMMC timeout clock frequency
    mmc: sdhci-acpi: Pass HID and UID to probe_slot
    mmc: sdhci-acpi: Get UID directly from acpi_device
    mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
    mmc: sdhci-pci: Fix Braswell eMMC timeout clock frequency
    mmc: sdhci: Let a driver override timeout clock frequency
    mmc: sdhci-pci: Add Bay Trail and Braswell SD card detect
    mmc: sdhci-pci: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel BYT host controllers
    mmc: sdhci-acpi: Add a HID and UID for a SD Card host controller
    mmc: sdhci-acpi: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel host controllers
    mmc: sdhci: Add quirk for always getting TC with stop cmd
    mmc: core: restore detect line inversion semantics
    mmc: Fix incorrect warning when setting 0 Hz via debugfs
    mmc: Fix use of wrong device in mmc_gpiod_free_cd()
    mmc: atmel-mci: fix mismatched section on atmci_cleanup_slot
    mmc: rtsx_pci: Set power related cap2 macros
    mmc: core: Add new power_mode MMC_POWER_UNDEFINED
    mmc: sdhci: execute tuning when device is not busy
    mmc: atmel-mci: Release mmc resources on failure in probe
    ..

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:

    - new IR driver: hix5hd2-ir

    - the virtual test driver (vivi) was replaced by vivid, with has an
    almost complete set of features to emulate most v4l2 devices and
    properly test all sorts of userspace apps

    - the as102 driver had several bugs fixed and was properly split into a
    frontend and a core driver. With that, it got promoted from staging
    into mainstream

    - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver)

    - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522)

    - one new PCI driver for ISDB-T/ISDB-S (pt3 driver)

    - saa7134 driver got support for go7007-based devices

    - added a new PCI driver for Techwell 68xx chipsets (tw68)

    - a new platform driver was added (coda)

    - new tuner drivers: mxl301rf and qm1d1c0042

    - a new DVB USB driver was added for DVBSky S860 & similar devices

    - added a new SDR driver (hackrf)

    - usbtv got audio support

    - several platform drivers are now compiled with COMPILE_TEST

    - a series of compiler fixup patches, making sparse/spatch happier with
    the media stuff and removing several warnings, especially on those
    platform drivers that didn't use to compile on x86

    - Support for several new modern devices got added

    - lots of other fixes, improvements and cleanups

    * tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits)
    [media] ir-hix5hd2: fix build on c6x arch
    [media] pt3: fix DTV FE I2C driver load error paths
    Revert "[media] media: em28xx - remove reset_resume interface"
    [media] exynos4-is: fix some warnings when compiling on arm64
    [media] usb drivers: use %zu instead of %zd
    [media] pci drivers: use %zu instead of %zd
    [media] dvb-frontends: use %zu instead of %zd
    [media] s5p-mfc: Fix several printk warnings
    [media] s5p_mfc_opr: Fix warnings
    [media] ti-vpe: Fix typecast
    [media] s3c-camif: fix dma_addr_t printks
    [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
    [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
    [media] em28xx: Fix identation
    [media] drxd: remove a dead code
    [media] saa7146: remove return after BUG()
    [media] cx88: remove return after BUG()
    [media] cx88: fix cards table CodingStyle
    [media] radio-sf16fmr2: declare some structs as static
    [media] radio-sf16fmi: declare pnp_attached as static
    ...

    Linus Torvalds
     
  • …it/groeck/linux-staging

    Pull hwmon updates from Guenter Roeck:
    - new driver for menf21bmc.
    - convert k10temp, smsc47b397, da9052, da9055 to new hwmon API.
    - register ntc_thermistor driver with thermal subsystem.
    - add support for F15h M60h to k10temp driver.
    - add driver for MEN14F021P00 BMC HWMON driver; this required a merge
    with tag mfd-hwmon-leds-watchdog-v3.18

    * tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
    hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver
    leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver
    watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog driver
    mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver
    hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor.
    hwmon: (smsc47b397) Convert to devm_hwmon_device_register_with_groups
    MAINTAINERS: add entry for the PWM fan driver
    hwmon: (k10temp) Convert to devm_hwmon_device_register_with_groups
    hwmon: (k10temp) Add support for F15h M60h
    hwmon: (da9052) Convert to devm_hwmon_device_register_with_groups
    hwmon: (da9055) Convert to devm_hwmon_device_register_with_groups
    hwmon: (ads1015) Use of_property_read_u32 at appropriate places

    Linus Torvalds
     
  • Updated APM X-Gene ethernet driver maintainers list.

    Signed-off-by: Iyappan Subramanian
    Signed-off-by: Keyur Chudgar
    Signed-off-by: David S. Miller

    Iyappan Subramanian
     

10 Oct, 2014

3 commits

  • Pull ACPI and power management updates from Rafael Wysocki:
    "Features-wise, to me the most important this time is a rework of
    wakeup interrupts handling in the core that makes them work
    consistently across all of the available sleep states, including
    suspend-to-idle. Many thanks to Thomas Gleixner for his help with
    this work.

    Second is an update of the generic PM domains code that has been in
    need of some care for quite a while. Unused code is being removed, DT
    support is being added and domains are now going to be attached to
    devices in bus type code in analogy with the ACPI PM domain. The
    majority of work here was done by Ulf Hansson who also has been the
    most active developer this time.

    Apart from this we have a traditional ACPICA update, this time to
    upstream version 20140828 and a few ACPI wakeup interrupts handling
    patches on top of the general rework mentioned above. There also are
    several cpufreq commits including renaming the cpufreq-cpu0 driver to
    cpufreq-dt, as this is what implements generic DT-based cpufreq
    support, and a new DT-based idle states infrastructure for cpuidle.

    In addition to that, the ACPI LPSS driver is updated, ACPI support for
    Apple machines is improved, a few bugs are fixed and a few cleanups
    are made all over.

    Finally, the Adaptive Voltage Scaling (AVS) subsystem now has a tree
    maintained by Kevin Hilman that will be merged through the PM tree.

    Numbers-wise, the generic PM domains update takes the lead this time
    with 32 non-merge commits, second is cpufreq (15 commits) and the 3rd
    place goes to the wakeup interrupts handling rework (13 commits).

    Specifics:

    - Rework the handling of wakeup IRQs by the IRQ core such that all of
    them will be switched over to "wakeup" mode in suspend_device_irqs()
    and in that mode the first interrupt will abort system suspend in
    progress or wake up the system if already in suspend-to-idle (or
    equivalent) without executing any interrupt handlers. Among other
    things that eliminates the wakeup-related motivation to use the
    IRQF_NO_SUSPEND interrupt flag with interrupts which don't really
    need it and should not use it (Thomas Gleixner and Rafael Wysocki)

    - Switch over ACPI to handling wakeup interrupts with the help of the
    new mechanism introduced by the above IRQ core rework (Rafael Wysocki)

    - Rework the core generic PM domains code to eliminate code that's
    not used, add DT support and add a generic mechanism by which
    devices can be added to PM domains automatically during enumeration
    (Ulf Hansson, Geert Uytterhoeven and Tomasz Figa).

    - Add debugfs-based mechanics for debugging generic PM domains
    (Maciej Matraszek).

    - ACPICA update to upstream version 20140828. Included are updates
    related to the SRAT and GTDT tables and the _PSx methods are in the
    METHOD_NAME list now (Bob Moore and Hanjun Guo).

    - Add _OSI("Darwin") support to the ACPI core (unfortunately, that
    can't really be done in a straightforward way) to prevent
    Thunderbolt from being turned off on Apple systems after boot (or
    after resume from system suspend) and rework the ACPI Smart Battery
    Subsystem (SBS) driver to work correctly with Apple platforms
    (Matthew Garrett and Andreas Noever).

    - ACPI LPSS (Low-Power Subsystem) driver update cleaning up the code,
    adding support for 133MHz I2C source clock on Intel Baytrail to it
    and making it avoid using UART RTS override with Auto Flow Control
    (Heikki Krogerus).

    - ACPI backlight updates removing the video_set_use_native_backlight
    quirk which is not necessary any more, making the code check the
    list of output devices returned by the _DOD method to avoid
    creating acpi_video interfaces that won't work and adding a quirk
    for Lenovo Ideapad Z570 (Hans de Goede, Aaron Lu and Stepan Bujnak)

    - New Win8 ACPI OSI quirks for some Dell laptops (Edward Lin)

    - Assorted ACPI code cleanups (Fabian Frederick, Rasmus Villemoes,
    Sudip Mukherjee, Yijing Wang, and Zhang Rui)

    - cpufreq core updates and cleanups (Viresh Kumar, Preeti U Murthy,
    Rasmus Villemoes)

    - cpufreq driver updates: cpufreq-cpu0/cpufreq-dt (driver name change
    among other things), ppc-corenet, powernv (Viresh Kumar, Preeti U
    Murthy, Shilpasri G Bhat, Lucas Stach)

    - cpuidle support for DT-based idle states infrastructure, new ARM64
    cpuidle driver, cpuidle core cleanups (Lorenzo Pieralisi, Rasmus
    Villemoes)

    - ARM big.LITTLE cpuidle driver updates: support for DT-based
    initialization and Exynos5800 compatible string (Lorenzo Pieralisi,
    Kevin Hilman)

    - Rework of the test_suspend kernel command line argument and a new
    trace event for console resume (Srinivas Pandruvada, Todd E Brandt)

    - Second attempt to optimize swsusp_free() (hibernation core) to make
    it avoid going through all PFNs which may be way too slow on some
    systems (Joerg Roedel)

    - devfreq updates (Paul Bolle, Punit Agrawal, Ãrjan Eide).

    - rockchip-io Adaptive Voltage Scaling (AVS) driver and AVS entry
    update in MAINTAINERS (Heiko Stübner, Kevin Hilman)

    - PM core fix related to clock management (Geert Uytterhoeven)

    - PM core's sysfs code cleanup (Johannes Berg)"

    * tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (105 commits)
    ACPI / fan: printk replacement
    PM / clk: Fix crash in clocks management code if !CONFIG_PM_RUNTIME
    PM / Domains: Rename cpu_data to cpuidle_data
    cpufreq: cpufreq-dt: fix potential double put of cpu OF node
    cpufreq: cpu0: rename driver and internals to 'cpufreq_dt'
    PM / hibernate: Iterate over set bits instead of PFNs in swsusp_free()
    cpufreq: ppc-corenet: remove duplicate update of cpu_data
    ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
    PM / sleep: Rename platform suspend/resume functions in suspend.c
    PM / sleep: Export dpm_suspend_late/noirq() and dpm_resume_early/noirq()
    ACPICA: Introduce acpi_enable_all_wakeup_gpes()
    ACPICA: Clear all non-wakeup GPEs in acpi_hw_enable_wakeup_gpe_block()
    ACPI / video: check _DOD list when creating backlight devices
    PM / Domains: Move dev_pm_domain_attach|detach() to pm_domain.h
    cpufreq: Replace strnicmp with strncasecmp
    cpufreq: powernv: Set the cpus to nominal frequency during reboot/kexec
    cpufreq: powernv: Set the pstate of the last hotplugged out cpu in policy->cpus to minimum
    cpufreq: Allow stop CPU callback to be used by all cpufreq drivers
    PM / devfreq: exynos: Enable building exynos PPMU as module
    PM / devfreq: Export helper functions for drivers
    ...

    Linus Torvalds
     
  • Pull PCI updates from Bjorn Helgaas:
    "The interesting things here are:

    - Turn on Config Request Retry Status Software Visibility. This
    caused hangs last time, but we included a fix this time.
    - Rework PCI device configuration to use _HPP/_HPX more aggressively
    - Allow PCI devices to be put into D3cold during system suspend
    - Add arm64 PCI support
    - Add APM X-Gene host bridge driver
    - Add TI Keystone host bridge driver
    - Add Xilinx AXI host bridge driver

    More detailed summary:

    Enumeration
    - Check Vendor ID only for Config Request Retry Status (Rajat Jain)
    - Enable Config Request Retry Status when supported (Rajat Jain)
    - Add generic domain handling (Catalin Marinas)
    - Generate uppercase hex for modalias interface class (Ricardo Ribalda Delgado)

    Resource management
    - Add missing MEM_64 mask in pci_assign_unassigned_bridge_resources() (Yinghai Lu)
    - Increase IBM ipr SAS Crocodile BARs to at least system page size (Douglas Lehr)

    PCI device hotplug
    - Prevent NULL dereference during pciehp probe (Andreas Noever)
    - Move _HPP & _HPX handling into core (Bjorn Helgaas)
    - Apply _HPP to PCIe devices as well as PCI (Bjorn Helgaas)
    - Apply _HPP/_HPX to display devices (Bjorn Helgaas)
    - Preserve SERR & PARITY settings when applying _HPP/_HPX (Bjorn Helgaas)
    - Preserve MPS and MRRS settings when applying _HPP/_HPX (Bjorn Helgaas)
    - Apply _HPP/_HPX to all devices, not just hot-added ones (Bjorn Helgaas)
    - Fix wait time in pciehp timeout message (Yinghai Lu)
    - Add more pciehp Slot Control debug output (Yinghai Lu)
    - Stop disabling pciehp notifications during init (Yinghai Lu)

    MSI
    - Remove arch_msi_check_device() (Alexander Gordeev)
    - Rename pci_msi_check_device() to pci_msi_supported() (Alexander Gordeev)
    - Move D0 check into pci_msi_check_device() (Alexander Gordeev)
    - Remove unused kobject from struct msi_desc (Yijing Wang)
    - Remove "pos" from the struct msi_desc msi_attrib (Yijing Wang)
    - Add "msi_bus" sysfs MSI/MSI-X control for endpoints (Yijing Wang)
    - Use __get_cached_msi_msg() instead of get_cached_msi_msg() (Yijing Wang)
    - Use __read_msi_msg() instead of read_msi_msg() (Yijing Wang)
    - Use __write_msi_msg() instead of write_msi_msg() (Yijing Wang)

    Power management
    - Drop unused runtime PM support code for PCIe ports (Rafael J. Wysocki)
    - Allow PCI devices to be put into D3cold during system suspend (Rafael J. Wysocki)

    AER
    - Add additional AER error strings (Gong Chen)
    - Make standalone includable (Thierry Reding)

    Virtualization
    - Add ACS quirk for Solarflare SFC9120 & SFC9140 (Alex Williamson)
    - Add ACS quirk for Intel 10G NICs (Alex Williamson)
    - Add ACS quirk for AMD A88X southbridge (Marti Raudsepp)
    - Remove unused pci_find_upstream_pcie_bridge(), pci_get_dma_source() (Alex Williamson)
    - Add device flag helpers (Ethan Zhao)
    - Assume all Mellanox devices have broken INTx masking (Gavin Shan)

    Generic host bridge driver
    - Fix ioport_map() for !CONFIG_GENERIC_IOMAP (Liviu Dudau)
    - Add pci_register_io_range() and pci_pio_to_address() (Liviu Dudau)
    - Define PCI_IOBASE as the base of virtual PCI IO space (Liviu Dudau)
    - Fix the conversion of IO ranges into IO resources (Liviu Dudau)
    - Add pci_get_new_domain_nr() and of_get_pci_domain_nr() (Liviu Dudau)
    - Add support for parsing PCI host bridge resources from DT (Liviu Dudau)
    - Add pci_remap_iospace() to map bus I/O resources (Liviu Dudau)
    - Add arm64 architectural support for PCI (Liviu Dudau)

    APM X-Gene
    - Add APM X-Gene PCIe driver (Tanmay Inamdar)
    - Add arm64 DT APM X-Gene PCIe device tree nodes (Tanmay Inamdar)

    Freescale i.MX6
    - Probe in module_init(), not fs_initcall() (Lucas Stach)
    - Delay enabling reference clock for SS until it stabilizes (Tim Harvey)

    Marvell MVEBU
    - Fix uninitialized variable in mvebu_get_tgt_attr() (Thomas Petazzoni)

    NVIDIA Tegra
    - Make sure the PCIe PLL is really reset (Eric Yuen)
    - Add error path tegra_msi_teardown_irq() cleanup (Jisheng Zhang)
    - Fix extended configuration space mapping (Peter Daifuku)
    - Implement resource hierarchy (Thierry Reding)
    - Clear CLKREQ# enable on port disable (Thierry Reding)
    - Add Tegra124 support (Thierry Reding)

    ST Microelectronics SPEAr13xx
    - Pass config resource through reg property (Pratyush Anand)

    Synopsys DesignWare
    - Use NULL instead of false (Fabio Estevam)
    - Parse bus-range property from devicetree (Lucas Stach)
    - Use pci_create_root_bus() instead of pci_scan_root_bus() (Lucas Stach)
    - Remove pci_assign_unassigned_resources() (Lucas Stach)
    - Check private_data validity in single place (Lucas Stach)
    - Setup and clear exactly one MSI at a time (Lucas Stach)
    - Remove open-coded bitmap operations (Lucas Stach)
    - Fix configuration base address when using 'reg' (Minghuan Lian)
    - Fix IO resource end address calculation (Minghuan Lian)
    - Rename get_msi_data() to get_msi_addr() (Minghuan Lian)
    - Add get_msi_data() to pcie_host_ops (Minghuan Lian)
    - Add support for v3.65 hardware (Murali Karicheri)
    - Fold struct pcie_port_info into struct pcie_port (Pratyush Anand)

    TI Keystone
    - Add TI Keystone PCIe driver (Murali Karicheri)
    - Limit MRSS for all downstream devices (Murali Karicheri)
    - Assume controller is already in RC mode (Murali Karicheri)
    - Set device ID based on SoC to support multiple ports (Murali Karicheri)

    Xilinx AXI
    - Add Xilinx AXI PCIe driver (Srikanth Thokala)
    - Fix xilinx_pcie_assign_msi() return value test (Dan Carpenter)

    Miscellaneous
    - Clean up whitespace (Quentin Lambert)
    - Remove assignments from "if" conditions (Quentin Lambert)
    - Move PCI_VENDOR_ID_VMWARE to pci_ids.h (Francesco Ruggeri)
    - x86: Mark DMI tables as initialization data (Mathias Krause)
    - x86: Move __init annotation to the correct place (Mathias Krause)
    - x86: Mark constants of pci_mmcfg_nvidia_mcp55() as __initconst (Mathias Krause)
    - x86: Constify pci_mmcfg_probes[] array (Mathias Krause)
    - x86: Mark PCI BIOS initialization code as such (Mathias Krause)
    - Parenthesize PCI_DEVID and PCI_VPD_LRDT_ID parameters (Megan Kamiya)
    - Remove unnecessary variable in pci_add_dynid() (Tobias Klauser)"

    * tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (109 commits)
    arm64: dts: Add APM X-Gene PCIe device tree nodes
    PCI: Add ACS quirk for AMD A88X southbridge devices
    PCI: xgene: Add APM X-Gene PCIe driver
    PCI: designware: Remove open-coded bitmap operations
    PCI/MSI: Remove unnecessary temporary variable
    PCI/MSI: Use __write_msi_msg() instead of write_msi_msg()
    MSI/powerpc: Use __read_msi_msg() instead of read_msi_msg()
    PCI/MSI: Use __get_cached_msi_msg() instead of get_cached_msi_msg()
    PCI/MSI: Add "msi_bus" sysfs MSI/MSI-X control for endpoints
    PCI/MSI: Remove "pos" from the struct msi_desc msi_attrib
    PCI/MSI: Remove unused kobject from struct msi_desc
    PCI/MSI: Rename pci_msi_check_device() to pci_msi_supported()
    PCI/MSI: Move D0 check into pci_msi_check_device()
    PCI/MSI: Remove arch_msi_check_device()
    irqchip: armada-370-xp: Remove arch_msi_check_device()
    PCI/MSI/PPC: Remove arch_msi_check_device()
    arm64: Add architectural support for PCI
    PCI: Add pci_remap_iospace() to map bus I/O resources
    of/pci: Add support for parsing PCI host bridge resources from DT
    of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()
    ...

    Conflicts:
    arch/arm64/boot/dts/apm-storm.dtsi

    Linus Torvalds
     
  • * patchwork: (544 commits)
    [media] ir-hix5hd2: fix build on c6x arch
    [media] pt3: fix DTV FE I2C driver load error paths
    Revert "[media] media: em28xx - remove reset_resume interface"
    [media] exynos4-is: fix some warnings when compiling on arm64
    [media] usb drivers: use %zu instead of %zd
    [media] pci drivers: use %zu instead of %zd
    [media] dvb-frontends: use %zu instead of %zd
    [media] s5p-mfc: Fix several printk warnings
    [media] s5p_mfc_opr: Fix warnings
    [media] ti-vpe: Fix typecast
    [media] s3c-camif: fix dma_addr_t printks
    [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
    [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
    [media] em28xx: Fix identation
    [media] drxd: remove a dead code
    [media] saa7146: remove return after BUG()
    [media] cx88: remove return after BUG()
    [media] cx88: fix cards table CodingStyle
    [media] radio-sf16fmr2: declare some structs as static
    [media] radio-sf16fmi: declare pnp_attached as static
    ...

    Conflicts:
    Documentation/DocBook/media/v4l/compat.xml

    Mauro Carvalho Chehab
     

09 Oct, 2014

2 commits

  • Pull irq updates from Thomas Gleixner:
    "The irq departement delivers:

    - a cleanup series to get rid of mindlessly copied code.

    - another bunch of new pointlessly different interrupt chip drivers.

    Adding homebrewn irq chips (and timers) to SoCs must provide a
    value add which is beyond the imagination of mere mortals.

    - the usual SoC irq controller updates, IOW my second cat herding
    project"

    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
    irqchip: gic-v3: Implement CPU PM notifier
    irqchip: gic-v3: Refactor gic_enable_redist to support both enabling and disabling
    irqchip: renesas-intc-irqpin: Add minimal runtime PM support
    irqchip: renesas-intc-irqpin: Add helper variable dev = &pdev->dev
    irqchip: atmel-aic5: Add sama5d4 support
    irqchip: atmel-aic5: The sama5d3 has 48 IRQs
    Documentation: bcm7120-l2: Add Broadcom BCM7120-style L2 binding
    irqchip: bcm7120-l2: Add Broadcom BCM7120-style Level 2 interrupt controller
    irqchip: renesas-irqc: Add binding docs for new R-Car Gen2 SoCs
    irqchip: renesas-irqc: Add DT binding documentation
    irqchip: renesas-intc-irqpin: Document SoC-specific bindings
    openrisc: Get rid of handle_IRQ
    arm64: Get rid of handle_IRQ
    ARM: omap2: irq: Convert to handle_domain_irq
    ARM: imx: tzic: Convert to handle_domain_irq
    ARM: imx: avic: Convert to handle_domain_irq
    irqchip: or1k-pic: Convert to handle_domain_irq
    irqchip: atmel-aic5: Convert to handle_domain_irq
    irqchip: atmel-aic: Convert to handle_domain_irq
    irqchip: gic-v3: Convert to handle_domain_irq
    ...

    Linus Torvalds
     
  • Update the driver version and add Sagi Grimberg as maintainer

    Signed-off-by: Or Gerlitz
    Signed-off-by: Roland Dreier

    Or Gerlitz