1. 24 Jan, 2014 6 commits
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfd10e7a
      Linus Torvalds authored
      Pull ARM SoC platform changes from Olof Johansson:
       "New core SoC-specific changes.
      
        New platforms:
         * Introduction of a vendor, Hisilicon, and one of their SoCs with
           some random numerical product name.
         * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
           i.e. !MMU).
         * Marvell Berlin series of SoCs, which include the one in Chromecast.
         * MOXA platform support, ARM9-based platform used mostly in
           industrial products
         * Support for Freescale's i.MX50 SoC.
      
        Other work:
         * Renesas work for new platforms and drivers, and conversion over to
           more multiplatform-friendly device registration schemes.
         * SMP support for Allwinner sunxi platforms.
         * ... plus a bunch of other stuff across various platforms"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
        ARM: tegra: fix tegra_powergate_sequence_power_up() inline
        ARM: msm_defconfig: Update for multi-platform
        ARM: msm: Move MSM's DT based hardware to multi-platform support
        ARM: msm: Only build timer.c if required
        ARM: msm: Only build clock.c on proc_comm based platforms
        ARM: ux500: Enable system suspend with WFI support
        ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
        ARM: shmobile: r8a7790: Fix I2C controller names
        ARM: msm: Simplify ARCH_MSM_DT config
        ARM: msm: Add support for MSM8974 SoC
        ARM: sunxi: select ARM_PSCI
        MAINTAINERS: Update Allwinner sunXi maintainer files
        ARM: sunxi: Select RESET_CONTROLLER
        ARM: imx: improve the comment of CCM lpm SW workaround
        ARM: imx: improve status check of clock gate
        ARM: imx: add necessary interface for pfd
        ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
        ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
        ARM: imx: Add cpu frequency scaling support
        ARM i.MX35: Add devicetree support.
        ...
      dfd10e7a
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f2c73464
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "This is the branch where we usually queue up cleanup efforts, moving
        drivers out of the architecture directory, header file restructuring,
        etc.  Sometimes they tangle with new development so it's hard to keep
        it strictly to cleanups.
      
        Some of the things included in this branch are:
      
         * Atmel SAMA5 conversion to common clock
         * Reset framework conversion for tegra platforms
          - Some of this depends on tegra clock driver reworks that are shared
            with Mike Turquette's clk tree.
         * Tegra DMA refactoring, which are shared branches with the DMA tree.
         * Removal of some header files on exynos to prepare for
           multiplatform"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)
        ARM: mvebu: move Armada 370/XP specific definitions to armada-370-xp.h
        ARM: mvebu: remove prototypes of non-existing functions from common.h
        ARM: mvebu: move ARMADA_XP_MAX_CPUS to armada-370-xp.h
        serial: sh-sci: Rework baud rate calculation
        serial: sh-sci: Compute overrun_bit without using baud rate algo
        serial: sh-sci: Remove unused GPIO request code
        serial: sh-sci: Move overrun_bit and error_mask fields out of pdata
        serial: sh-sci: Support resources passed through platform resources
        serial: sh-sci: Don't check IRQ in verify port operation
        serial: sh-sci: Set the UPF_FIXED_PORT flag
        serial: sh-sci: Remove duplicate interrupt check in verify port op
        serial: sh-sci: Simplify baud rate calculation algorithms
        serial: sh-sci: Remove baud rate calculation algorithm 5
        serial: sh-sci: Sort headers alphabetically
        ARM: EXYNOS: Kill exynos_pm_late_initcall()
        ARM: EXYNOS: Consolidate selection of PM_GENERIC_DOMAINS for Exynos4
        ARM: at91: switch Calao QIL-A9260 board to DT
        clk: at91: fix pmc_clk_ids data type attriubte
        PM / devfreq: use inclusion <mach/map.h> instead of <plat/map-s5p.h>
        ARM: EXYNOS: remove <mach/regs-clock.h> for exynos
        ...
      f2c73464
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 93abdb77
      Linus Torvalds authored
      Pull ARM SoC non-critical fixes from Olof Johansson:
       "As usual, we have a batch of fixes that weren't considered significant
        enough to warrant going into the later -rcs for previous release, so
        they are queued up on this branch.
      
        A handful of these are for various DT fixups for Samsung platforms,
        and a handful of other minor things.
      
        There are also a couple of stable-marked patches for mvebu -- they
        came in quite late and we decided to keep them deferred until the
        first -stable release to get more coverage instead of squeezing them
        into 3.13"
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        ARM: at91: smc: bug fix in sam9_smc_cs_read()
        i2c: mv64xxx: Document the newly introduced Armada XP A0 compatible
        i2c: mv64xxx: Fix bus hang on A0 version of the Armada XP SoCs
        ARM: mvebu: Add quirk for i2c for the OpenBlocks AX3-4 board
        ARM: mvebu: Add support to get the ID and the revision of a SoC
        ARM: dts: msm: Fix gpio interrupt and reg length
        irqchip: sirf: set IRQ_LEVEL status_flags
        ARM: OMAP2+: gpmc: Move legacy GPMC width setting
        ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy()
        ARM: OMAP2+: gpmc: Move initialization outside the gpmc_t condition
        ARM: OMAP2+: board-generic: update SoC compatibility strings
        Documentation: dt: OMAP: explicitly state SoC compatible strings
        ARM: OMAP2+: enable AM33xx SOC EVM audio
        ARM: OMAP2+: Select USB PHY for AM335x SoC
        ARM: bcm2835: Fix grammar in help message
        ARM: msm: trout: fix uninit var warning
        ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2
        ARM: dts: Fix definition of MSHC device tree nodes for exynos4x12
        ARM: dts: add clock provider for mshc node for Exynos4412 SOC
        clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
        ...
      93abdb77
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · f3415351
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "In this set, we have:
         - Refactoring of some of the old StrongARM-1100 GPIO code to make
           things simpler by Dmitry Eremin-Solenikov
         - Read-only and non-executable support for modules on ARM from Laura
           Abbot
         - Removal of unnecessary set_drvdata() calls in AMBA code
         - Some non-executable support for kernel lowmem mappings at the 1MB
           section granularity, and dumping of kernel page tables via debugfs
         - Some improvements for the timer/clock code on Footbridge platforms,
           and cleanup some of the LED code there
         - Fix fls/ffs() signatures to match x86 to prevent build warnings,
           particularly where these are used with min/max() macros
         - Avoid using the bootmem allocator on ARM (patches from Santosh
           Shilimkar)
         - Various asid/unaligned access updates from Will Deacon"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (51 commits)
        ARM: SMP implementations are not supposed to return from smp_ops.cpu_die()
        ARM: ignore memory below PHYS_OFFSET
        Fix select-induced Kconfig warning for ZBOOT_ROM
        ARM: fix ffs/fls implementations to match x86
        ARM: 7935/1: sa1100: collie: add gpio-keys configuration
        ARM: 7932/1: bcm: Add DEBUG_LL console support
        ARM: 7929/1: Remove duplicate SCHED_HRTICK config option
        ARM: 7928/1: kconfig: select HAVE_EFFICIENT_UNALIGNED_ACCESS for CPUv6+ && MMU
        ARM: 7927/1: dcache: select DCACHE_WORD_ACCESS for big-endian CPUs
        ARM: 7926/1: mm: flesh out and fix the comments in the ASID allocator
        ARM: 7925/1: mm: keep track of last ASID allocation to improve bitmap searching
        ARM: 7924/1: mm: don't bother with reserved ttbr0 when running with LPAE
        ARM: PCI: add legacy IDE IRQ implementation
        ARM: footbridge: cleanup LEDs code
        ARM: pgd allocation: retry on failure
        ARM: footbridge: add one-shot mode for DC21285 timer
        ARM: footbridge: add sched_clock implementation
        ARM: 7922/1: l2x0: add Marvell Tauros3 support
        ARM: 7877/1: use built-in byte swap function
        ARM: 7921/1: mcpm: remove redundant dsb instructions prior to sev
        ...
      f3415351
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 13c789a6
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 3.14:
      
         - Improved crypto_memneq helper
         - Use cyprto_memneq in arch-specific crypto code
         - Replaced orphaned DCP driver with Freescale MXS DCP driver
         - Added AVX/AVX2 version of AESNI-GCM encode and decode
         - Added AMD Cryptographic Coprocessor (CCP) driver
         - Misc fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (41 commits)
        crypto: aesni - fix build on x86 (32bit)
        crypto: mxs - Fix sparse non static symbol warning
        crypto: ccp - CCP device enabled/disabled changes
        crypto: ccp - Cleanup hash invocation calls
        crypto: ccp - Change data length declarations to u64
        crypto: ccp - Check for caller result area before using it
        crypto: ccp - Cleanup scatterlist usage
        crypto: ccp - Apply appropriate gfp_t type to memory allocations
        crypto: drivers - Sort drivers/crypto/Makefile
        ARM: mxs: dts: Enable DCP for MXS
        crypto: mxs - Add Freescale MXS DCP driver
        crypto: mxs - Remove the old DCP driver
        crypto: ahash - Fully restore ahash request before completing
        crypto: aesni - fix build on x86 (32bit)
        crypto: talitos - Remove redundant dev_set_drvdata
        crypto: ccp - Remove redundant dev_set_drvdata
        crypto: crypto4xx - Remove redundant dev_set_drvdata
        crypto: caam - simplify and harden key parsing
        crypto: omap-sham - Fix Polling mode for larger blocks
        crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite
        ...
      13c789a6
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/users/eparis/audit · 6dd9158a
      Linus Torvalds authored
      Pull audit update from Eric Paris:
       "Again we stayed pretty well contained inside the audit system.
        Venturing out was fixing a couple of function prototypes which were
        inconsistent (didn't hurt anything, but we used the same value as an
        int, uint, u32, and I think even a long in a couple of places).
      
        We also made a couple of minor changes to when a couple of LSMs called
        the audit system.  We hoped to add aarch64 audit support this go
        round, but it wasn't ready.
      
        I'm disappearing on vacation on Thursday.  I should have internet
        access, but it'll be spotty.  If anything goes wrong please be sure to
        cc rgb@redhat.com.  He'll make fixing things his top priority"
      
      * git://git.infradead.org/users/eparis/audit: (50 commits)
        audit: whitespace fix in kernel-parameters.txt
        audit: fix location of __net_initdata for audit_net_ops
        audit: remove pr_info for every network namespace
        audit: Modify a set of system calls in audit class definitions
        audit: Convert int limit uses to u32
        audit: Use more current logging style
        audit: Use hex_byte_pack_upper
        audit: correct a type mismatch in audit_syscall_exit()
        audit: reorder AUDIT_TTY_SET arguments
        audit: rework AUDIT_TTY_SET to only grab spin_lock once
        audit: remove needless switch in AUDIT_SET
        audit: use define's for audit version
        audit: documentation of audit= kernel parameter
        audit: wait_for_auditd rework for readability
        audit: update MAINTAINERS
        audit: log task info on feature change
        audit: fix incorrect set of audit_sock
        audit: print error message when fail to create audit socket
        audit: fix dangling keywords in audit_log_set_loginuid() output
        audit: log on errors from filter user rules
        ...
      6dd9158a
  2. 23 Jan, 2014 15 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 90804ed6
      Linus Torvalds authored
      Pull UDF & jbd fixes from Jan Kara:
       "A cleanup of JBD log messages and UDF fix of a lockdep warning"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: Fix lockdep warning from udf_symlink()
        jbd: Revise KERN_EMERG error messages
      90804ed6
    • Stephen Hemminger's avatar
      assoc_array: remove global variable · 30b02c4b
      Stephen Hemminger authored
      The associative array code creates unnecessary and potentially
      problematic global variable 'status'.  Remove it since never used.
      Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      30b02c4b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 5ee7a81a
      Linus Torvalds authored
      Pull fuse update from Miklos Szeredi:
       "This contains a fix for a potential use-after-module-unload bug
        noticed by Al and caching improvements for read-only fuse filesystems
        by Andrew Gallagher"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: support clients that don't implement 'open'
        fuse: don't invalidate attrs when not using atime
        fuse: fix SetPageUptodate() condition in STORE
        fuse: fix pipe_buf_operations
      5ee7a81a
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 0d90d638
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, a couple of sysfs entries were introduced to tune the
        f2fs at runtime.
      
        In addition, f2fs starts to support inline_data and improves the
        read/write performance in some workloads by refactoring bio-related
        flows.
      
        This patch-set includes the following major enhancement patches.
         - support inline_data
         - refactor bio operations such as merge operations and rw type
           assignment
         - enhance the direct IO path
         - enhance bio operations
         - truncate a node page when it becomes obsolete
         - add sysfs entries: small_discards, max_victim_search, and
           in-place-update
         - add a sysfs entry to control max_victim_search
      
        The other bug fixes are as follows.
         - fix a bug in truncate_partial_nodes
         - avoid warnings during sparse and build process
         - fix error handling flows
         - fix potential bit overflows
      
        And, there are a bunch of cleanups"
      
      * tag 'for-f2fs-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (95 commits)
        f2fs: drop obsolete node page when it is truncated
        f2fs: introduce NODE_MAPPING for code consistency
        f2fs: remove the orphan block page array
        f2fs: add help function META_MAPPING
        f2fs: move a branch for code redability
        f2fs: call mark_inode_dirty to flush dirty pages
        f2fs: clean checkpatch warnings
        f2fs: missing REQ_META and REQ_PRIO when sync_meta_pages(META_FLUSH)
        f2fs: avoid f2fs_balance_fs call during pageout
        f2fs: add delimiter to seperate name and value in debug phrase
        f2fs: use spinlock rather than mutex for better speed
        f2fs: move alloc new orphan node out of lock protection region
        f2fs: move grabing orphan pages out of protection region
        f2fs: remove the needless parameter of f2fs_wait_on_page_writeback
        f2fs: update documents and a MAINTAINERS entry
        f2fs: add a sysfs entry to control max_victim_search
        f2fs: improve write performance under frequent fsync calls
        f2fs: avoid to read inline data except first page
        f2fs: avoid to left uninitialized data in page when read inline data
        f2fs: fix truncate_partial_nodes bug
        ...
      0d90d638
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-v3.14-rc1' of git://oss.sgi.com/xfs/xfs · 1d32bdaf
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "This is primarily bug fixes, many of which you already have.  New
        stuff includes a series to decouple the in-memory and on-disk log
        format, helpers in the area of inode clusters, and i_version handling.
      
        We decided to try to use more topic branches this release, so there
        are some merge commits in there on account of that.  I'm afraid I
        didn't do a good job of putting meaningful comments in the first
        couple of merges.  Sorry about that.  I think I have the hang of it
        now.
      
        For 3.14-rc1 there are fixes in the areas of remote attributes,
        discard, growfs, memory leaks in recovery, directory v2, quotas, the
        MAINTAINERS file, allocation alignment, extent list locking, and in
        xfs_bmapi_allocate.  There are cleanups in xfs_setsize_buftarg,
        removing unused macros, quotas, setattr, and freeing of inode
        clusters.  The in-memory and on-disk log format have been decoupled, a
        common helper to calculate the number of blocks in an inode cluster
        has been added, and handling of i_version has been pulled into the
        filesystems that use it.
      
         - cleanup in xfs_setsize_buftarg
         - removal of remaining unused flags for vop toss/flush/flushinval
         - fix for memory corruption in xfs_attrlist_by_handle
         - fix for out-of-date comment in xfs_trans_dqlockedjoin
         - fix for discard if range length is less than one block
         - fix for overrun of agfl buffer using growfs on v4 superblock
           filesystems
         - pull i_version handling out into the filesystems that use it
         - don't leak recovery items on error
         - fix for memory leak in xfs_dir2_node_removename
         - several cleanups for quotas
         - fix bad assertion in xfs_qm_vop_create_dqattach
         - cleanup for xfs_setattr_mode, and add xfs_setattr_time
         - fix quota assert in xfs_setattr_nonsize
         - fix an infinite loop when turning off group/project quota before
           user quota
         - fix for temporary buffer allocation failure in xfs_dir2_block_to_sf
           with large directory block sizes
         - fix Dave's email address in MAINTAINERS
         - cleanup calculation of freed inode cluster blocks
         - fix alignment of initial file allocations to match filesystem
           geometry
         - decouple in-memory and on-disk log format
         - introduce a common helper to calculate the number of filesystem
           blocks in an inode cluster
         - fixes for extent list locking
         - fix for off-by-one in xfs_attr3_rmt_verify
         - fix for missing destroy_work_on_stack in xfs_bmapi_allocate"
      
      * tag 'xfs-for-linus-v3.14-rc1' of git://oss.sgi.com/xfs/xfs: (51 commits)
        xfs: Calling destroy_work_on_stack() to pair with INIT_WORK_ONSTACK()
        xfs: fix off-by-one error in xfs_attr3_rmt_verify
        xfs: assert that we hold the ilock for extent map access
        xfs: use xfs_ilock_attr_map_shared in xfs_attr_list_int
        xfs: use xfs_ilock_attr_map_shared in xfs_attr_get
        xfs: use xfs_ilock_data_map_shared in xfs_qm_dqiterate
        xfs: use xfs_ilock_data_map_shared in xfs_qm_dqtobp
        xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes
        xfs: reinstate the ilock in xfs_readdir
        xfs: add xfs_ilock_attr_map_shared
        xfs: rename xfs_ilock_map_shared
        xfs: remove xfs_iunlock_map_shared
        xfs: no need to lock the inode in xfs_find_handle
        xfs: use xfs_icluster_size_fsb in xfs_imap
        xfs: use xfs_icluster_size_fsb in xfs_ifree_cluster
        xfs: use xfs_icluster_size_fsb in xfs_ialloc_inode_init
        xfs: use xfs_icluster_size_fsb in xfs_bulkstat
        xfs: introduce a common helper xfs_icluster_size_fsb
        xfs: get rid of XFS_IALLOC_BLOCKS macros
        xfs: get rid of XFS_INODE_CLUSTER_SIZE macros
        ...
      1d32bdaf
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 0dc3fd02
      Linus Torvalds authored
      Pull module updates from Rusty Russell.
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: Add missing newline in printk call.
        module: fix coding style
        export: declare ksymtab symbols
        module.h: Remove unnecessary semicolon
        params: improve standard definitions
        Add Documentation/module-signing.txt file
      0dc3fd02
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 93b05cba
      Linus Torvalds authored
      Pull virtio update from Rusty Russell:
       "A few simple fixes.  Quiet cycle"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c
        virtio-scsi: Fix hotcpu_notifier use-after-free with virtscsi_freeze
        virtio: pci: remove unnecessary pci_set_drvdata()
      93b05cba
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 84621c9b
      Linus Torvalds authored
      Pull Xen updates from Konrad Rzeszutek Wilk:
       "Two major features that Xen community is excited about:
      
        The first is event channel scalability by David Vrabel - we switch
        over from an two-level per-cpu bitmap of events (IRQs) - to an FIFO
        queue with priorities.  This lets us be able to handle more events,
        have lower latency, and better scalability.  Good stuff.
      
        The other is PVH by Mukesh Rathor.  In short, PV is a mode where the
        kernel lets the hypervisor program page-tables, segments, etc.  With
        EPT/NPT capabilities in current processors, the overhead of doing this
        in an HVM (Hardware Virtual Machine) container is much lower than the
        hypervisor doing it for us.
      
        In short we let a PV guest run without doing page-table, segment,
        syscall, etc updates through the hypervisor - instead it is all done
        within the guest container.  It is a "hybrid" PV - hence the 'PVH'
        name - a PV guest within an HVM container.
      
        The major benefits are less code to deal with - for example we only
        use one function from the the pv_mmu_ops (which has 39 function
        calls); faster performance for syscall (no context switches into the
        hypervisor); less traps on various operations; etc.
      
        It is still being baked - the ABI is not yet set in stone.  But it is
        pretty awesome and we are excited about it.
      
        Lastly, there are some changes to ARM code - you should get a simple
        conflict which has been resolved in #linux-next.
      
        In short, this pull has awesome features.
      
        Features:
         - FIFO event channels.  Key advantages: support for over 100,000
           events (2^17), 16 different event priorities, improved fairness in
           event latency through the use of FIFOs.
         - Xen PVH support.  "It’s a fully PV kernel mode, running with
           paravirtualized disk and network, paravirtualized interrupts and
           timers, no emulated devices of any kind (and thus no qemu), no BIOS
           or legacy boot — but instead of requiring PV MMU, it uses the HVM
           hardware extensions to virtualize the pagetables, as well as system
           calls and other privileged operations." (from "The
           Paravirtualization Spectrum, Part 2: From poles to a spectrum")
      
        Bug-fixes:
         - Fixes in balloon driver (refactor and make it work under ARM)
         - Allow xenfb to be used in HVM guests.
         - Allow xen_platform_pci=0 to work properly.
         - Refactors in event channels"
      
      * tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (52 commits)
        xen/pvh: Set X86_CR0_WP and others in CR0 (v2)
        MAINTAINERS: add git repository for Xen
        xen/pvh: Use 'depend' instead of 'select'.
        xen: delete new instances of __cpuinit usage
        xen/fb: allow xenfb initialization for hvm guests
        xen/evtchn_fifo: fix error return code in evtchn_fifo_setup()
        xen-platform: fix error return code in platform_pci_init()
        xen/pvh: remove duplicated include from enlighten.c
        xen/pvh: Fix compile issues with xen_pvh_domain()
        xen: Use dev_is_pci() to check whether it is pci device
        xen/grant-table: Force to use v1 of grants.
        xen/pvh: Support ParaVirtualized Hardware extensions (v3).
        xen/pvh: Piggyback on PVHVM XenBus.
        xen/pvh: Piggyback on PVHVM for grant driver (v4)
        xen/grant: Implement an grant frame array struct (v3).
        xen/grant-table: Refactor gnttab_init
        xen/grants: Remove gnttab_max_grant_frames dependency on gnttab_init.
        xen/pvh: Piggyback on PVHVM for event channels (v2)
        xen/pvh: Update E820 to work with PVH (v2)
        xen/pvh: Secondary VCPU bringup (non-bootup CPUs)
        ...
      84621c9b
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 7ebd3faa
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "First round of KVM updates for 3.14; PPC parts will come next week.
      
        Nothing major here, just bugfixes all over the place.  The most
        interesting part is the ARM guys' virtualized interrupt controller
        overhaul, which lets userspace get/set the state and thus enables
        migration of ARM VMs"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (67 commits)
        kvm: make KVM_MMU_AUDIT help text more readable
        KVM: s390: Fix memory access error detection
        KVM: nVMX: Update guest activity state field on L2 exits
        KVM: nVMX: Fix nested_run_pending on activity state HLT
        KVM: nVMX: Clean up handling of VMX-related MSRs
        KVM: nVMX: Add tracepoints for nested_vmexit and nested_vmexit_inject
        KVM: nVMX: Pass vmexit parameters to nested_vmx_vmexit
        KVM: nVMX: Leave VMX mode on clearing of feature control MSR
        KVM: VMX: Fix DR6 update on #DB exception
        KVM: SVM: Fix reading of DR6
        KVM: x86: Sync DR7 on KVM_SET_DEBUGREGS
        add support for Hyper-V reference time counter
        KVM: remove useless write to vcpu->hv_clock.tsc_timestamp
        KVM: x86: fix tsc catchup issue with tsc scaling
        KVM: x86: limit PIT timer frequency
        KVM: x86: handle invalid root_hpa everywhere
        kvm: Provide kvm_vcpu_eligible_for_directed_yield() stub
        kvm: vfio: silence GCC warning
        KVM: ARM: Remove duplicate include
        arm/arm64: KVM: relax the requirements of VMA alignment for THP
        ...
      7ebd3faa
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · bb1281f2
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina:
       "Usual rocket science stuff from trivial.git"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        neighbour.h: fix comment
        sched: Fix warning on make htmldocs caused by wait.h
        slab: struct kmem_cache is protected by slab_mutex
        doc: Fix typo in USB Gadget Documentation
        of/Kconfig: Spelling s/one/once/
        mkregtable: Fix sscanf handling
        lp5523, lp8501: comment improvements
        thermal: rcar: comment spelling
        treewide: fix comments and printk msgs
        IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
        Documentation: update /proc/uptime field description
        Documentation: Fix size parameter for snprintf
        arm: fix comment header and macro name
        asm-generic: uaccess: Spelling s/a ny/any/
        mtd: onenand: fix comment header
        doc: driver-model/platform.txt: fix a typo
        drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
        doc: Fix typo (acces_process_vm -> access_process_vm)
        treewide: Fix typos in printk
        drivers/gpu/drm/qxl/Kconfig: reformat the help text
        ...
      bb1281f2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 4988abf1
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - quite some work on hid-sony driver in order to have DualShock 4
         device properly supported, from Frank Praznik
      
       - fixed support for suspending I2C conntected devices, from Mika
         Westerberg
      
       - regression fix for 0xff05 usage on Microsoft Ergonomy, from Jiri
         Kosina
      
       - support for Synaptics HD touchscreen, from AceLan Kao
      
       - workaround for USB 3.0 problem for logitech-dj connected devices,
         from Benjamin Tisssoires
      
       - support for Logitech Dual Action pads, from Vitaly Katraew
      
       - quite a few other assorted fixes and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
        HID: sony: Use colors for the Dualshock 4 LED names
        HID: sony: Add annotated HID descriptor for the Dualshock 4
        HID: sony: Cache the output report for the Dualshock 4
        HID: sony: Map gyroscopes and accelerometers to axes
        HID: sony: Fix spacing in the device definitions.
        HID: sony: Use standard output reports instead of raw reports to send data to the Dualshock 4.
        HID: sony: Use separate identifiers for USB and Bluetooth connected Dualshock 4 controllers.
        HID: hid-holtek-mouse: add new a070 mouse
        HID: hid-sensor-hub: Fix buggy report descriptors
        HID: logitech-dj: Fix USB 3.0 issue
        HID: sony: Rename worker function
        HID: sony: Add LED controls for the Dualshock 4
        HID: sony: Add force-feedback support for the Dualshock 4
        HID: hidraw: make comment more accurate and nicer
        HID: sony: fix error return code
        HID: input: fix input sysfs path for hid devices
        HID: debug: add labels for some new buttons
        HID: remove SIS entries from hid_have_special_driver[]
        HID: microsoft: no fallthrough in MS ergonomy 0xff05 usage
        HID: add support for SiS multitouch panel in the touch monitor LG 23ET83V
        ...
      4988abf1
    • Linus Torvalds's avatar
      Merge tag 'dm-3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · fe41c2c0
      Linus Torvalds authored
      Pull device-mapper changes from Mike Snitzer:
       "A lot of attention was paid to improving the thin-provisioning
        target's handling of metadata operation failures and running out of
        space.  A new 'error_if_no_space' feature was added to allow users to
        error IOs rather than queue them when either the data or metadata
        space is exhausted.
      
        Additional fixes/features include:
         - a few fixes to properly support thin metadata device resizing
         - a solution for reliably waiting for a DM device's embedded kobject
           to be released before destroying the device
         - old dm-snapshot is updated to use the dm-bufio interface to take
           advantage of readahead capabilities that improve snapshot
           activation
         - new dm-cache target tunables to control how quickly data is
           promoted to the cache (fast) device
         - improved write efficiency of cluster mirror target by combining
           userspace flush and mark requests"
      
      * tag 'dm-3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (35 commits)
        dm log userspace: allow mark requests to piggyback on flush requests
        dm space map metadata: fix bug in resizing of thin metadata
        dm cache: add policy name to status output
        dm thin: fix pool feature parsing
        dm sysfs: fix a module unload race
        dm snapshot: use dm-bufio prefetch
        dm snapshot: use dm-bufio
        dm snapshot: prepare for switch to using dm-bufio
        dm snapshot: use GFP_KERNEL when initializing exceptions
        dm cache: add block sizes and total cache blocks to status output
        dm btree: add dm_btree_find_lowest_key
        dm space map metadata: fix extending the space map
        dm space map common: make sure new space is used during extend
        dm: wait until embedded kobject is released before destroying a device
        dm: remove pointless kobject comparison in dm_get_from_kobject
        dm snapshot: call destroy_work_on_stack() to pair with INIT_WORK_ONSTACK()
        dm cache policy mq: introduce three promotion threshold tunables
        dm cache policy mq: use list_del_init instead of list_del + INIT_LIST_HEAD
        dm thin: fix set_pool_mode exposed pool operation races
        dm thin: eliminate the no_free_space flag
        ...
      fe41c2c0
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 194e57fd
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This patch set is a lot of driver updates for qla4xxx, bfa, hpsa,
        qla2xxx.  It also removes the aic7xxx_old driver (which has been
        deprecated for nearly a decade) and adds support for deadlines in
        error handling"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (75 commits)
        [SCSI] hpsa: allow SCSI mid layer to handle unit attention
        [SCSI] hpsa: do not require board "not ready" status after hard reset
        [SCSI] hpsa: enable unit attention reporting
        [SCSI] hpsa: rename scsi prefetch field
        [SCSI] hpsa: use workqueue instead of kernel thread for lockup detection
        [SCSI] ipr: increase dump size in ipr driver
        [SCSI] mac_scsi: Fix crash on out of memory
        [SCSI] st: fix enlarge_buffer
        [SCSI] qla1280: Annotate timer on stack so object debug does not complain
        [SCSI] qla4xxx: Update driver version to 5.04.00-k3
        [SCSI] qla4xxx: Recreate chap data list during get chap operation
        [SCSI] qla4xxx: Add support for ISCSI_PARAM_LOCAL_IPADDR sysfs attr
        [SCSI] libiscsi: Add local_ipaddr parameter in iscsi_conn struct
        [SCSI] scsi_transport_iscsi: Export ISCSI_PARAM_LOCAL_IPADDR attr for iscsi_connection
        [SCSI] qla4xxx: Add host statistics support
        [SCSI] scsi_transport_iscsi: Add host statistics support
        [SCSI] qla4xxx: Added support for Diagnostics MBOX command
        [SCSI] bfa: Driver version upgrade to 3.2.23.0
        [SCSI] bfa: change FC_ELS_TOV to 20sec
        [SCSI] bfa: Observed auto D-port mode instead of manual
        ...
      194e57fd
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · e1ba8459
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for the v3.14 merge window:
      
        Resource management
          - Change pci_bus_region addresses to dma_addr_t (Bjorn Helgaas)
          - Support 64-bit AGP BARs (Bjorn Helgaas, Yinghai Lu)
          - Add pci_bus_address() to get bus address of a BAR (Bjorn Helgaas)
          - Use pci_resource_start() for CPU address of AGP BARs (Bjorn Helgaas)
          - Enforce bus address limits in resource allocation (Yinghai Lu)
          - Allocate 64-bit BARs above 4G when possible (Yinghai Lu)
          - Convert pcibios_resource_to_bus() to take pci_bus, not pci_dev (Yinghai Lu)
      
        PCI device hotplug
          - Major rescan/remove locking update (Rafael J. Wysocki)
          - Make ioapic builtin only (not modular) (Yinghai Lu)
          - Fix release/free issues (Yinghai Lu)
          - Clean up pciehp (Bjorn Helgaas)
          - Announce pciehp slot info during enumeration (Bjorn Helgaas)
      
        MSI
          - Add pci_msi_vec_count(), pci_msix_vec_count() (Alexander Gordeev)
          - Add pci_enable_msi_range(), pci_enable_msix_range() (Alexander Gordeev)
          - Deprecate "tri-state" interfaces: fail/success/fail+info (Alexander Gordeev)
          - Export MSI mode using attributes, not kobjects (Greg Kroah-Hartman)
          - Drop "irq" param from *_restore_msi_irqs() (DuanZhenzhong)
      
        SR-IOV
          - Clear NumVFs when disabling SR-IOV in sriov_init() (ethan.zhao)
      
        Virtualization
          - Add support for save/restore of extended capabilities (Alex Williamson)
          - Add Virtual Channel to save/restore support (Alex Williamson)
          - Never treat a VF as a multifunction device (Alex Williamson)
          - Add pci_try_reset_function(), et al (Alex Williamson)
      
        AER
          - Ignore non-PCIe error sources (Betty Dall)
          - Support ACPI HEST error sources for domains other than 0 (Betty Dall)
          - Consolidate HEST error source parsers (Bjorn Helgaas)
          - Add a TLP header print helper (Borislav Petkov)
      
        Freescale i.MX6
          - Remove unnecessary code (Fabio Estevam)
          - Make reset-gpio optional (Marek Vasut)
          - Report "link up" only after link training completes (Marek Vasut)
          - Start link in Gen1 before negotiating for Gen2 mode (Marek Vasut)
          - Fix PCIe startup code (Richard Zhu)
      
        Marvell MVEBU
          - Remove duplicate of_clk_get_by_name() call (Andrew Lunn)
          - Drop writes to bridge Secondary Status register (Jason Gunthorpe)
          - Obey bridge PCI_COMMAND_MEM and PCI_COMMAND_IO bits (Jason Gunthorpe)
          - Support a bridge with no IO port window (Jason Gunthorpe)
          - Use max_t() instead of max(resource_size_t,) (Jingoo Han)
          - Remove redundant of_match_ptr (Sachin Kamat)
          - Call pci_ioremap_io() at startup instead of dynamically (Thomas Petazzoni)
      
        NVIDIA Tegra
          - Disable Gen2 for Tegra20 and Tegra30 (Eric Brower)
      
        Renesas R-Car
          - Add runtime PM support (Valentine Barshak)
          - Fix rcar_pci_probe() return value check (Wei Yongjun)
      
        Synopsys DesignWare
          - Fix crash in dw_msi_teardown_irq() (Bjørn Erik Nilsen)
          - Remove redundant call to pci_write_config_word() (Bjørn Erik Nilsen)
          - Fix missing MSI IRQs (Harro Haan)
          - Add dw_pcie prefix before cfg_read/write (Pratyush Anand)
          - Fix I/O transfers by using CPU (not realio) address (Pratyush Anand)
          - Whitespace cleanup (Jingoo Han)
      
        EISA
          - Call put_device() if device_register() fails (Levente Kurusa)
          - Revert EISA initialization breakage ((Bjorn Helgaas)
      
        Miscellaneous
          - Remove unused code, including PCIe 3.0 interfaces (Stephen Hemminger)
          - Prevent bus conflicts while checking for bridge apertures (Bjorn Helgaas)
          - Stop clearing bridge Secondary Status when setting up I/O aperture (Bjorn Helgaas)
          - Use dev_is_pci() to identify PCI devices (Yijing Wang)
          - Deprecate DEFINE_PCI_DEVICE_TABLE (Joe Perches)
          - Update documentation 00-INDEX (Erik Ekman)"
      
      * tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (119 commits)
        Revert "EISA: Initialize device before its resources"
        Revert "EISA: Log device resources in dmesg"
        vfio-pci: Use pci "try" reset interface
        PCI: Check parent kobject in pci_destroy_dev()
        xen/pcifront: Use global PCI rescan-remove locking
        powerpc/eeh: Use global PCI rescan-remove locking
        PCI: Fix pci_check_and_unmask_intx() comment typos
        PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()
        MPT / PCI: Use pci_stop_and_remove_bus_device_locked()
        platform / x86: Use global PCI rescan-remove locking
        PCI: hotplug: Use global PCI rescan-remove locking
        pcmcia: Use global PCI rescan-remove locking
        ACPI / hotplug / PCI: Use global PCI rescan-remove locking
        ACPI / PCI: Use global PCI rescan-remove locking in PCI root hotplug
        PCI: Add global pci_lock_rescan_remove()
        PCI: Cleanup pci.h whitespace
        PCI: Reorder so actual code comes before stubs
        PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0
        ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
        PCI: Make local functions static
        ...
      e1ba8459
    • Linus Torvalds's avatar
      Merge tag 'trace-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 60eaa019
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This pull request has a new feature to ftrace, namely the trace event
        triggers by Tom Zanussi.  A trigger is a way to enable an action when
        an event is hit.  The actions are:
      
         o  trace on/off - enable or disable tracing
         o  snapshot     - save the current trace buffer in the snapshot
         o  stacktrace   - dump the current stack trace to the ringbuffer
         o  enable/disable events - enable or disable another event
      
        Namhyung Kim added updates to the tracing uprobes code.  Having the
        uprobes add support for fetch methods.
      
        The rest are various bug fixes with the new code, and minor ones for
        the old code"
      
      * tag 'trace-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (38 commits)
        tracing: Fix buggered tee(2) on tracing_pipe
        tracing: Have trace buffer point back to trace_array
        ftrace: Fix synchronization location disabling and freeing ftrace_ops
        ftrace: Have function graph only trace based on global_ops filters
        ftrace: Synchronize setting function_trace_op with ftrace_trace_function
        tracing: Show available event triggers when no trigger is set
        tracing: Consolidate event trigger code
        tracing: Fix counter for traceon/off event triggers
        tracing: Remove double-underscore naming in syscall trigger invocations
        tracing/kprobes: Add trace event trigger invocations
        tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT
        tracing/uprobes: Add @+file_offset fetch method
        uprobes: Allocate ->utask before handler_chain() for tracing handlers
        tracing/uprobes: Add support for full argument access methods
        tracing/uprobes: Fetch args before reserving a ring buffer
        tracing/uprobes: Pass 'is_return' to traceprobe_parse_probe_arg()
        tracing/probes: Implement 'memory' fetch method for uprobes
        tracing/probes: Add fetch{,_size} member into deref fetch method
        tracing/probes: Move 'symbol' fetch method to kprobes
        tracing/probes: Implement 'stack' fetch method for uprobes
        ...
      60eaa019
  3. 22 Jan, 2014 19 commits
    • Jaegeuk Kim's avatar
      f2fs: drop obsolete node page when it is truncated · bf39c00a
      Jaegeuk Kim authored
      If a node page is trucated, we'd better drop the page in the node_inode's page
      cache for better memory footprint.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      bf39c00a
    • Andrew Gallagher's avatar
      fuse: support clients that don't implement 'open' · 7678ac50
      Andrew Gallagher authored
      open/release operations require userspace transitions to keep track
      of the open count and to perform any FS-specific setup.  However,
      for some purely read-only FSs which don't need to perform any setup
      at open/release time, we can avoid the performance overhead of
      calling into userspace for open/release calls.
      
      This patch adds the necessary support to the fuse kernel modules to prevent
      open/release operations from hitting in userspace. When the client returns
      ENOSYS, we avoid sending the subsequent release to userspace, and also
      remember this so that future opens also don't trigger a userspace
      operation.
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      7678ac50
    • Andrew Gallagher's avatar
      fuse: don't invalidate attrs when not using atime · 451418fc
      Andrew Gallagher authored
      Various read operations (e.g. readlink, readdir) invalidate the cached
      attrs for atime changes.  This patch adds a new function
      'fuse_invalidate_atime', which checks for a read-only super block and
      avoids the attr invalidation in that case.
      Signed-off-by: default avatarAndrew Gallagher <andrewjcg@fb.com>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      451418fc
    • Miklos Szeredi's avatar
      fuse: fix SetPageUptodate() condition in STORE · 063ec1e5
      Miklos Szeredi authored
      As noticed by Coverity the "num != 0" condition never triggers.  Instead it
      should check for a complete page.
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      063ec1e5
    • Miklos Szeredi's avatar
      fuse: fix pipe_buf_operations · 28a625cb
      Miklos Szeredi authored
      Having this struct in module memory could Oops when if the module is
      unloaded while the buffer still persists in a pipe.
      
      Since sock_pipe_buf_ops is essentially the same as fuse_dev_pipe_buf_steal
      merge them into nosteal_pipe_buf_ops (this is the same as
      default_pipe_buf_ops except stealing the page from the buffer is not
      allowed).
      Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: stable@vger.kernel.org
      28a625cb
    • James Bottomley's avatar
      Merge branch 'misc' into for-linus · 4b1a9a5e
      James Bottomley authored
      4b1a9a5e
    • Jiri Kosina's avatar
      Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid',... · 62813858
      Jiri Kosina authored
      Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus
      62813858
    • Jaegeuk Kim's avatar
      f2fs: introduce NODE_MAPPING for code consistency · 4ef51a8f
      Jaegeuk Kim authored
      This patch adds NODE_MAPPING which is similar as META_MAPPING introduced by
      Gu Zheng.
      
      Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      4ef51a8f
    • Gu Zheng's avatar
      f2fs: remove the orphan block page array · 63f5384c
      Gu Zheng authored
      As the orphan_blocks may be max to 504, so it is not security
      and rigorous to store such a large array in the kernel stack
      as Dan Carpenter said.
      In fact, grab_meta_page has locked the page in the page cache,
      and we can use find_get_page() to fetch the page safely in the
      downstream, so we can remove the page array directly.
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      63f5384c
    • Gu Zheng's avatar
      f2fs: add help function META_MAPPING · 9df27d98
      Gu Zheng authored
      Introduce help function META_MAPPING() to get the cache meta blocks'
      address space.
      Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      9df27d98
    • Jaegeuk Kim's avatar
      f2fs: move a branch for code redability · e8dae604
      Jaegeuk Kim authored
      This patch moves a function in f2fs_delete_entry for code readability.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      e8dae604
    • Jaegeuk Kim's avatar
      f2fs: call mark_inode_dirty to flush dirty pages · a18ff063
      Jaegeuk Kim authored
      If a dentry page is updated, we should call mark_inode_dirty to add the inode
      into the dirty list, so that its dentry pages are flushed to the disk.
      Otherwise, the inode can be evicted without flush.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      a18ff063
    • Li Zhong's avatar
      neighbour.h: fix comment · c04e7da0
      Li Zhong authored
      Signed-off-by: default avatarLi Zhong <zhong@linux.vnet.ibm.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      c04e7da0
    • Masanari Iida's avatar
      sched: Fix warning on make htmldocs caused by wait.h · f434f7af
      Masanari Iida authored
      Missing "@" in include/linux/wait.h cause "make htmldocs" failed
      with following warning messages.
      
      Warning(/home/iida/Repo/linux-next//include/linux/wait.h:304):
      No description found for parameter 'cmd1'
      Warning(/home/iida/Repo/linux-next//include/linux/wait.h:304):
      No description found for parameter 'cmd2'
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      f434f7af
    • Dongmao Zhang's avatar
      dm log userspace: allow mark requests to piggyback on flush requests · 5066a4df
      Dongmao Zhang authored
      In the cluster evironment, cluster write has poor performance because
      userspace_flush() has to contact a userspace program (cmirrord) for
      clear/mark/flush requests.  But both mark and flush requests require
      cmirrord to communicate the message to all the cluster nodes for each
      flush call.  This behaviour is really slow.
      
      To address this we now merge mark and flush requests together to reduce
      the kernel-userspace-kernel time.  We allow a new directive,
      "integrated_flush" that can be used to instruct the kernel log code to
      combine flush and mark requests when directed by userspace.  If not
      directed by userspace (due to an older version of the userspace code
      perhaps), the kernel will function as it did previously - preserving
      backwards compatibility.  Additionally, flush requests are performed
      lazily when only clear requests exist.
      Signed-off-by: default avatarDongmao Zhang <dmzhang@suse.com>
      Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
      Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      5066a4df
    • Linus Torvalds's avatar
      Merge branch 'akpm' (incoming from Andrew) · df32e43a
      Linus Torvalds authored
      Merge first patch-bomb from Andrew Morton:
      
       - a couple of misc things
      
       - inotify/fsnotify work from Jan
      
       - ocfs2 updates (partial)
      
       - about half of MM
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (117 commits)
        mm/migrate: remove unused function, fail_migrate_page()
        mm/migrate: remove putback_lru_pages, fix comment on putback_movable_pages
        mm/migrate: correct failure handling if !hugepage_migration_support()
        mm/migrate: add comment about permanent failure path
        mm, page_alloc: warn for non-blockable __GFP_NOFAIL allocation failure
        mm: compaction: reset scanner positions immediately when they meet
        mm: compaction: do not mark unmovable pageblocks as skipped in async compaction
        mm: compaction: detect when scanners meet in isolate_freepages
        mm: compaction: reset cached scanner pfn's before reading them
        mm: compaction: encapsulate defer reset logic
        mm: compaction: trace compaction begin and end
        memcg, oom: lock mem_cgroup_print_oom_info
        sched: add tracepoints related to NUMA task migration
        mm: numa: do not automatically migrate KSM pages
        mm: numa: trace tasks that fail migration due to rate limiting
        mm: numa: limit scope of lock for NUMA migrate rate limiting
        mm: numa: make NUMA-migrate related functions static
        lib/show_mem.c: show num_poisoned_pages when oom
        mm/hwpoison: add '#' to hwpoison_inject
        mm/memblock: use WARN_ONCE when MAX_NUMNODES passed as input parameter
        ...
      df32e43a
    • Linus Torvalds's avatar
      Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · fbd918a2
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Support for some new embedded controllers.
      
        A couple late (<= a week) fixes have stable cc'd and one patch ("SATA:
        MV: Add support for the optional PHYs") got committed yesterday
        because otherwise the resulting kernel would fail boot on an embedded
        board due to interdependent changes in its platform tree.
      
        Other than that, nothing too noteworthy"
      
      * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        SATA: MV: Add support for the optional PHYs
        sata-highbank: Remove unnecessary ahci_platform.h include
        libata: disable LPM for some WD SATA-I devices
        ARM: mvebu: update the SATA compatible string for Armada 370/XP
        ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs
        ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
        ata: pata_samsung_cf: Remove unused macros
        ata: pata_samsung_cf: Use devm_ioremap_resource()
        ata: pata_samsung_cf: Merge pata_samsung_cf.h into pata_samsung_cf.c
        ata: pata_samsung_cf: Move plat/regs-ata.h to drivers/ata
        drivers: ata: Mark the function as static in libahci.c
        drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c
        ahci: imx: fix the error handling in imx_ahci_probe()
        ahci: imx: ahci_imx_softreset() can be static
        ahci: imx: Add i.MX53 support
        ahci: imx: Pull out the clock enable/disable calls
        libata, dt: Document sata_rcar bindings
        sata_rcar: Add R-Car Gen2 SATA PHY support
        ahci: mcp89: enter AHCI mode under Apple BIOS emulation
        ata: libata-eh: Remove unnecessary snprintf arithmetic
      fbd918a2
    • Linus Torvalds's avatar
      Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · f075e0f6
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "The bulk of changes are cleanups and preparations for the upcoming
        kernfs conversion.
      
         - cgroup_event mechanism which is and will be used only by memcg is
           moved to memcg.
      
         - pidlist handling is updated so that it can be served by seq_file.
      
           Also, the list is not sorted if sane_behavior.  cgroup
           documentation explicitly states that the file is not sorted but it
           has been for quite some time.
      
         - All cgroup file handling now happens on top of seq_file.  This is
           to prepare for kernfs conversion.  In addition, all operations are
           restructured so that they map 1-1 to kernfs operations.
      
         - Other cleanups and low-pri fixes"
      
      * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (40 commits)
        cgroup: trivial style updates
        cgroup: remove stray references to css_id
        doc: cgroups: Fix typo in doc/cgroups
        cgroup: fix fail path in cgroup_load_subsys()
        cgroup: fix missing unlock on error in cgroup_load_subsys()
        cgroup: remove for_each_root_subsys()
        cgroup: implement for_each_css()
        cgroup: factor out cgroup_subsys_state creation into create_css()
        cgroup: combine css handling loops in cgroup_create()
        cgroup: reorder operations in cgroup_create()
        cgroup: make for_each_subsys() useable under cgroup_root_mutex
        cgroup: css iterations and css_from_dir() are safe under cgroup_mutex
        cgroup: unify pidlist and other file handling
        cgroup: replace cftype->read_seq_string() with cftype->seq_show()
        cgroup: attach cgroup_open_file to all cgroup files
        cgroup: generalize cgroup_pidlist_open_file
        cgroup: unify read path so that seq_file is always used
        cgroup: unify cgroup_write_X64() and cgroup_write_string()
        cgroup: remove cftype->read(), ->read_map() and ->write()
        hugetlb_cgroup: convert away from cftype->read()
        ...
      f075e0f6
    • Linus Torvalds's avatar
      Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 5cb7398c
      Linus Torvalds authored
      Pull percpu changes from Tejun Heo:
       "Two trivial changes - addition of WARN_ONCE() in lib/percpu-refcount.c
        and use of VMALLOC_TOTAL instead of END - START in percpu.c"
      
      * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: use VMALLOC_TOTAL instead of VMALLOC_END - VMALLOC_START
        percpu-refcount: Add a WARN() for ref going negative
      5cb7398c