1. 11 Nov, 2013 7 commits
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f9efbce6
      Linus Torvalds authored
      Pull ARM SoC DT updates from Olof Johansson:
       "Most of this branch consists of updates, additions and general churn
        of the device tree source files in the kernel (arch/arm/boot/dts).
        Besides that, there are a few things to point out:
      
         - Lots of platform conversion on OMAP2+, with removal of old board
           files for various platforms.
         - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
           well
         - Some updates to pinctrl and other subsystems.  Most of these are
           for DT-enablement of the various platforms and acks have been
           collected"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
        ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
        ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
        ARM: dts: bcm281xx: Add card detect GPIO
        ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
        ARM: bcm281xx: Add device node for the GPIO controller
        ARM: mvebu: Add Netgear ReadyNAS 104 board
        ARM: tegra: fix Tegra114 IOMMU register address
        ARM: kirkwood: add support for OpenBlocks A7 platform
        ARM: dts: omap4-panda: add DPI pinmuxing
        ARM: dts: AM33xx: Add RNG node
        ARM: dts: AM33XX: Add hwspinlock node
        ARM: dts: OMAP5: Add hwspinlock node
        ARM: dts: OMAP4: Add hwspinlock node
        ARM: dts: use 'status' property for PCIe nodes
        ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
        ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
        ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
        ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
        ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
        ARM: mvebu: Add the core-divider clock to Armada 370/XP
        ...
      f9efbce6
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 53575aa9
      Linus Torvalds authored
      Pull ARM driver updates from Olof Johansson:
       "Updates of SoC-near drivers and other driver updates that makes more
        sense to take through our tree.  In this case it's involved:
      
         - Some Davinci driver updates that has required corresponding
           platform code changes (gpio mostly)
         - CCI bindings and a few driver updates
         - Marvell mvebu patches for PCI MSI support (could have gone through
           the PCI tree for this release, but they were acked by Bjorn for
           3.12 so we kept them through arm-soc).
         - Marvell dove switch-over to DT-based PCIe configuration
         - Misc updates for Samsung platform dmaengine drivers"
      
      * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442
        dmaengine: s3c24xx-dma: add support for the s3c2410 type of controller
        ARM: S3C24XX: Fix possible dma selection warning
        PCI: mvebu: make local functions static
        PCI: mvebu: add I/O access wrappers
        PCI: mvebu: Dynamically detect if the PEX link is up to enable hot plug
        ARM: mvebu: fix gated clock documentation
        ARM: dove: remove legacy pcie and clock init
        ARM: dove: switch to DT probed mbus address windows
        ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device
        ARM: S3C24XX: add platform-devices for new dma driver for s3c2412 and s3c2443
        dmaengine: add driver for Samsung s3c24xx SoCs
        ARM: S3C24XX: number the dma clocks
        PCI: mvebu: add support for Marvell Dove SoCs
        PCI: mvebu: add support for reset on GPIO
        PCI: mvebu: remove subsys_initcall
        PCI: mvebu: increment nports only for registered ports
        PCI: mvebu: move clock enable before register access
        PCI: mvebu: add support for MSI
        irqchip: armada-370-xp: implement MSI support
        ...
      53575aa9
    • Linus Torvalds's avatar
      Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d5aabbca
      Linus Torvalds authored
      Pull ARM SoC board updates from Olof Johansson:
       "Board-related updates.  This branch is getting smaller and smaller,
        which is the whole idea so that's reassuring.
      
        Right now by far most of the code is related to shmobile updates, and
        they are now switching over to removal of board code and migration to
        multiplatform, so we'll see their board code base shrink in the near
        future too, I hope.
      
        In addition to that is some defconfig updates, some display updates
        for OMAP and a bit of new board support for Rockchip boards"
      
      * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (56 commits)
        ARM: rockchip: add support for rk3188 and Radxa Rock board
        ARM: rockchip: add dts for bqcurie2 tablet
        ARM: rockchip: enable arm-global-timer
        ARM: rockchip: move shared dt properties to common source file
        ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
        ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
        ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
        ARM: OMAP2+: drm: Don't build device for DMM
        ARM: tegra: defconfig updates
        RX-51: Add support for OMAP3 ROM Random Number Generator
        ARM: OMAP3: RX-51: ARM errata 430973 workaround
        ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1
        ARM: shmobile: marzen: enable INTC IRQ
        ARM: shmobile: bockw: add SMSC support on reference
        ARM: shmobile: Use SMP on Koelsch
        ARM: shmobile: Remove KZM9D reference DTS
        ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
        ARM: shmobile: Remove non-multiplatform KZM9D reference support
        ARM: shmobile: Use KZM9D without reference for multiplatform
        ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
        ...
      d5aabbca
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · aac59e3e
      Linus Torvalds authored
      Pull ARM SoC platform changes from Olof Johansson:
       "New and updated SoC support.  Among the things new for this release
        are:
      
         - More support for the AM33xx platforms from TI
         - Tegra 124 support, and some updates to older tegra families as well
         - imx cleanups and updates across the board
         - A rename of Broadcom's Mobile platforms which were introduced as
           ARCH_BCM, and turned out to be too broad a name.  New name is
           ARCH_BCM_MOBILE.
         - A whole bunch of updates and fixes for integrator, making the
           platform code more modern and switches over to DT-only booting.
         - Support for two new Renesas shmobile chipsets.  Next up for them is
           more work on consolidation instead of introduction of new
           non-multiplatform SoCs, we're all looking forward to that!
         - Misc cleanups for older Samsung platforms, some Allwinner updates,
           etc"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits)
        ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config
        ARM: bcm_defconfig: Run "make savedefconfig"
        ARM: bcm281xx: Add ARCH Timers to config
        rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
        ARM: vexpress: Enable platform-specific options in defconfig
        ARM: vexpress: Make defconfig work again
        ARM: sunxi: remove .init_time hooks
        ARM: imx: enable suspend for imx6sl
        ARM: imx: ensure dsm_request signal is not asserted when setting LPM
        ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter()
        ARM: imx6q: move low-power code out of clock driver
        ARM: imx: drop extern with function prototypes in common.h
        ARM: imx: reset core along with enable/disable operation
        ARM: imx: do not return from imx_cpu_die() call
        ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING
        ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options
        ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO
        ARM: imx: replace imx6q_restart() with mxc_restart()
        ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt
        ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt
        ...
      aac59e3e
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 21604cdc
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "This branch contains code cleanups, moves and removals for 3.13.
      
        Qualcomm msm targets had a bunch of code removal for legacy non-DT
        platforms.  Nomadik saw more device tree conversions and cleanup of
        old code.  Tegra has some code refactoring, etc.
      
        One longish patch series from Sebastian Hasselbarth changes the
        init_time hooks and tries to use a generic implementation for most
        platforms, since they were all doing more or less the same things.
      
        Finally the "shark" platform is removed in this release.  It's been
        abandoned for a while and nobody seems to care enough to keep it
        around.  If someone comes along and wants to resurrect it, the removal
        can easily be reverted and code brought back.
      
        Beyond this, mostly a bunch of removals of stale content across the
        board, etc"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (79 commits)
        ARM: gemini: convert to GENERIC_CLOCKEVENTS
        ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
        ARM: OMAP3: control: add API for setting IVA bootmode
        ARM: OMAP3: CM/control: move CM scratchpad save to CM driver
        ARM: OMAP3: McBSP: do not access CM register directly
        ARM: OMAP3: clock: add API to enable/disable autoidle for a single clock
        ARM: OMAP2: CM/PM: remove direct register accesses outside CM code
        MAINTAINERS: Add patterns for DTS files for AT91
        ARM: at91: remove init_machine() as default is suitable
        ARM: at91/dt: split sama5d3 peripheral definitions
        ARM: at91/dt: split sam9x5 peripheral definitions
        ARM: Remove temporary sched_clock.h header
        ARM: clps711x: Use linux/sched_clock.h
        MAINTAINERS: Add DTS files to patterns for Samsung platform
        ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file
        ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order
        clk: nomadik: fix missing __init on nomadik_src_init
        ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
        ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX
        ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
        ...
      21604cdc
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · beb5bfe4
      Linus Torvalds authored
      Pull ARM SoC low-priority fixes from Olof Johansson:
       "A set of fixes for various platforms that weren't considered bad
        enough to include in 3.12 (nor -stable).  Mostly simple typo fixes,
        etc"
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP2+: irq, AM33XX add missing register check
        ARM: OMAP2+: wakeupgen: AM43x adaptation
        ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected
        ARM: dts: fix PL330 MDMA1 address in DT for Universal C210 board
        ARM: dts: Work around lack of cpufreq regulator lookup for exynos4210-origen and trats boards
        ARM: dts: Fix typo earlyprintk in exynos5440-sd5v1 and ssdk5440 boards
        ARM: dts: Correct typo in use of samsung,pin-drv for exynos5250
        ARM: rockchip: remove obsolete rockchip,config properties
        ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
        ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations.
        ARM: OMAP1: fix incorrect placement of __initdata tag
        ARM: OMAP: remove deprecated IRQF_DISABLED
        ARM: OMAP2+: throw the die id into the entropy pool
      beb5bfe4
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 05ad391d
      Linus Torvalds authored
      Pull ARM64 update from Catalin Marinas:
       "Main features:
         - Ticket-based spinlock implementation and lockless lockref support
         - Big endian support
         - CPU hotplug support, currently for PSCI (Power State Coordination
           Interface) capable firmware
         - Virtual address space extended to 42-bit in the 64K page
           configuration (maximum VA space with 2 levels of page tables)
         - Compat (AArch32) kuser helpers updated to ARMv8 (make use of
           load-acquire/store-release instructions)
         - Code cleanup, defconfig update and minor fixes"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (43 commits)
        ARM64: /proc/interrupts: display IPIs of online CPUs only
        arm64: locks: Remove CONFIG_GENERIC_LOCKBREAK
        arm64: KVM: vgic: byteswap GICv2 access on world switch if BE
        arm64: KVM: initialize HYP mode following the kernel endianness
        arm64: compat: Clear the IT state independent of the 32-bit ARM or Thumb-2 mode
        arm64: Use 42-bit address space with 64K pages
        arm64: module: ensure instruction is little-endian before manipulation
        arm64: defconfig: Enable CONFIG_PREEMPT by default
        arm64: fix access to preempt_count from assembly code
        arm64: move enabling of GIC before CPUs are set online
        arm64: use generic RW_DATA_SECTION macro in linker script
        arm64: Slightly improve the warning on CPU0 enable-method
        ARM64: simplify cpu_read_bootcpu_ops using OF/DT helper
        ARM64: DT: define ARM64 specific arch_match_cpu_phys_id
        arm64: allow ioremap_cache() to use existing RAM mappings
        arm64: update 32-bit kuser helpers to ARMv8
        arm64: perf: fix event number mask
        arm64: kconfig: allow CPU_BIG_ENDIAN to be selected
        arm64: Fix the endianness of arch_spinlock_t
        arm64: big-endian: write CPU holding pen address as LE
        ...
      05ad391d
  2. 10 Nov, 2013 1 commit
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 8b5baa46
      Linus Torvalds authored
      Pull gfs2 updates from Steven Whitehouse:
       "The main feature of interest this time is quota updates.  There are
        some clean ups and some patches to use the new generic lru list code.
      
        There is still plenty of scope for some further changes in due course -
        faster lookups of quota structures is very much on the todo list.
        Also, a start has been made towards the more tricky issue of using the
        generic lru code with glocks, but that will have to be completed in a
        subsequent merge window.
      
        The other, more minor feature, is that there have been a number of
        performance patches which relate to block allocation.  In particular
        they will improve performance when the disk is nearly full"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Use generic list_lru for quota
        GFS2: Rename quota qd_lru_lock qd_lock
        GFS2: Use reflink for quota data cache
        GFS2: Use lockref for glocks
        GFS2: Protect quota sync generation
        GFS2: Inline qd_trylock into gfs2_quota_unlock
        GFS2: Make two similar quota code fragments into a function
        GFS2: Remove obsolete quota tunable
        GFS2: Move gfs2_icbit_munge into quota.c
        GFS2: Speed up starting point selection for block allocation
        GFS2: Add allocation parameters structure
        GFS2: Clean up reservation removal
        GFS2: fix dentry leaks
        GFS2: new function gfs2_rbm_incr
        GFS2: Introduce rbm field bii
        GFS2: Do not reset flags on active reservations
        GFS2: introduce bi_blocks for optimization
        GFS2: optimize rbm_from_block wrt bi_start
        GFS2: d_splice_alias() can't return error
      8b5baa46
  3. 07 Nov, 2013 12 commits
    • Linus Torvalds's avatar
      Merge tag 'ftrace-urgent-3.12-v2' of... · 6c86ae29
      Linus Torvalds authored
      Merge tag 'ftrace-urgent-3.12-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull perf/ftrace fix from Steven Rostedt:
       "Dave Jones's trinity program was able to enable the function tracer
        from a normal user account via the perf syscall "perf_event_open()".
        When I was able to reproduce it with trinity, I was able to track down
        exactly how it happened.
      
        I discovered that the check for whether the function tracepoint should
        be activated or not was using the "perf_paranoid_kernel()" check which
        by default, lets the user continue.  The user should not by default be
        able to enable function tracing.
      
        The fix is to use "perf_paranoid_tracepoint_raw()" which will not let
        the user enable function tracing.  This is a security fix as normal
        users should never be allowed to enable the function tracer"
      
      * tag 'ftrace-urgent-3.12-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        perf/ftrace: Fix paranoid level for enabling function tracer
      6c86ae29
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3ae423fe
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       - Some minor work bringing the Cobalt MIPS platforms in line with other
         MIPS platforms
       - Make vmlinux.32 and vmlinux.64 build messages less verbose
       - Always register the R4k clocksource when selected, the clock source's
         rating will decide if this or another clock source is actually going
         to be used
       - Drop support for the Cisco (formerly Scientific Atlanta) PowerTV
         platform.  There appears to be nobody left who cares and the USB
         driver went stale while waiting for years to be merged
       - Some cleanup of Loongson 2 related #ifdefery
       - Various minor cleanups
       - Major rework on all things related to tracing / ptrace on MIPS,
         including switching the MIPS ELF core dumper to regsets, enabling the
         entries for SIGSYS in struct siginfo for MIPS, enabling ftrace
         syscall trace points
       - Some more work to bring DECstation support code in line with other
         more modern code
       - Report the name of the detected CPU, not just its CP0 PrID value
       - Some more BCM 47xx and atheros ath79xx work
       - Support for compressed kernels using the XZ compression scheme
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (53 commits)
        MIPS: remove duplicate define
        MIPS: Random whitespace clean-ups
        MIPS: traps: Reformat notify_die invocations to 80 columns.
        MIPS: Print correct PC in trace dump after NMI exception
        MIPS: kernel: cpu-probe: Report CPU id during probe
        MIPS: Remove unused defines in piix4.h
        MIPS: Get rid of hard-coded values for Malta PIIX4 fixups
        MIPS: Always register R4K clock when selected
        MIPS: Loongson: Get rid of Loongson 2 #ifdefery all over arch/mips.
        MIPS: cacheops.h: Increase indentation by one tab.
        MIPS: Remove bogus BUG_ON()
        MIPS: PowerTV: Remove support code.
        MIPS: ftrace: Add support for syscall tracepoints.
        MIPS: ptrace: Switch syscall reporting to tracehook_report_syscall_entry().
        MIPS: Move audit_arch() helper function to __syscall_get_arch().
        MIPS: Enable HAVE_ARCH_TRACEHOOK.
        MIPS: Switch ELF core dumper to use regsets.
        MIPS: Implement task_user_regset_view.
        MIPS: ptrace: Use tracehook helpers.
        MIPS: O32 / 32-bit: Always copy 4 stack arguments.
        ...
      3ae423fe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 280c84d1
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The bulk of the patches for the 3.13 merge window.
      
        Heiko spent quite a bit of work to improve the code generation for the
        kernel.  That includes the exploitation of the interlocked-access
        facility for the atomics and bitops implementation and the improvement
        for the -march and -mtune compiler settings.
      
        Another important change is the removal of the user_mode=home option,
        user processes now always run in primary space.  The storage keys are
        not initialized at system startup any more, with that the storage key
        removal work is complete.  For the PCI support the hibernation hooks
        have been implemented.
      
        And as usual cleanup and fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (62 commits)
        s390/scm_blk: fix endless loop for requests != REQ_TYPE_FS
        s390/mm,tlb: correct tlb flush on page table upgrade
        s390/mm: page_table_realloc returns failure
        s390: allow to set gcc -mtune flag
        s390/percpu: remove this_cpu_xor() implementation
        s390/vtime: correct idle time calculation
        s390/time: fix get_tod_clock_ext inline assembly
        tty/hvc_iucv: remove redundant NULL check
        s390/dasd: Write to profile data area only if it is available
        s390: convert use of typedef ctl_table to struct ctl_table
        s390/pci: cleanup function information block
        s390/pci: remove CONFIG_PCI_DEBUG dependancy
        s390/pci: message cleanup
        Update default configuration
        s390: add a couple of useful defconfigs
        s390/percpu: make use of interlocked-access facility 1 instructions
        s390/percpu: use generic percpu ops for CONFIG_32BIT
        s390/compat: make psw32_user_bits a constant value again
        s390: fix handling of runtime instrumentation psw bit
        s390: fix save and restore of the floating-point-control register
        ...
      280c84d1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 8efdf2b7
      Linus Torvalds authored
      Pull CIFS updates from Steve French:
       "Includes a couple of fixes, plus changes to make multiplex identifiers
        easier to read and correlate with network traces, and a set of
        enhancements for SMB3 dialect.  Also adds support for per-file
        compression for both cifs and smb2/smb3 ("chattr +c filename).
      
        Should have at least one other merge request ready by next week with
        some new SMB3 security features and copy offload support"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        Query network adapter info at mount time for debugging
        Fix unused variable warning when CIFS POSIX disabled
        Allow setting per-file compression via CIFS protocol
        Query File System Alignment
        Query device characteristics at mount time from server on SMB2/3 not just on cifs mounts
        cifs: Send a logoff request before removing a smb session
        cifs: Make big endian multiplex ID sequences monotonic on the wire
        cifs: Remove redundant multiplex identifier check from check_smb_hdr()
        Query file system attributes from server on SMB2, not just cifs, mounts
        Allow setting per-file compression via SMB2/3
        Fix corrupt SMB2 ioctl requests
      8efdf2b7
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · c224b76b
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
         - Changes to the RPC socket code to allow NFSv4 to turn off
           timeout+retry:
            * Detect TCP connection breakage through the "keepalive" mechanism
         - Add client side support for NFSv4.x migration (Chuck Lever)
         - Add support for multiple security flavour arguments to the "sec="
           mount option (Dros Adamson)
         - fs-cache bugfixes from David Howells:
           * Fix an issue whereby caching can be enabled on a file that is
             open for writing
         - More NFSv4 open code stable bugfixes
         - Various Labeled NFS (selinux) bugfixes, including one stable fix
         - Fix buffer overflow checking in the RPCSEC_GSS upcall encoding"
      
      * tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (68 commits)
        NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security
        NFSv4: Sanity check the server reply in _nfs4_server_capabilities
        NFSv4.2: encode_readdir - only ask for labels when doing readdirplus
        nfs: set security label when revalidating inode
        NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
        NFS: Fix a missing initialisation when reading the SELinux label
        nfs: fix oops when trying to set SELinux label
        nfs: fix inverted test for delegation in nfs4_reclaim_open_state
        SUNRPC: Cleanup xs_destroy()
        SUNRPC: close a rare race in xs_tcp_setup_socket.
        SUNRPC: remove duplicated include from clnt.c
        nfs: use IS_ROOT not DCACHE_DISCONNECTED
        SUNRPC: Fix buffer overflow checking in gss_encode_v0_msg/gss_encode_v1_msg
        SUNRPC: gss_alloc_msg - choose _either_ a v0 message or a v1 message
        SUNRPC: remove an unnecessary if statement
        nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c'
        nfs: Use PTR_ERR_OR_ZERO in 'nfs41_callback_up' function
        nfs: Remove useless 'error' assignment
        sunrpc: comment typo fix
        SUNRPC: Add correct rcu_dereference annotation in rpc_clnt_set_transport
        ...
      c224b76b
    • Sudeep KarkadaNagesha's avatar
      ARM64: /proc/interrupts: display IPIs of online CPUs only · 67317c26
      Sudeep KarkadaNagesha authored
      The non-IPI interrupts are displayed only for the online cpus from
      show_interrupts in kernel/irq/proc.c before calling arch_show_interrupts().
      As a result, the column headers and the IPI count don't match if any
      CPU is offline.
      
      This patch fixes show_ipi_list to display IPIs for online CPUs only.
      Signed-off-by: default avatarSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      67317c26
    • Linus Torvalds's avatar
      Revert "sysfs: drop kobj_ns_type handling" · a1212d27
      Linus Torvalds authored
      This reverts commit cb26a311.
      
      It mysteriously causes NetworkManager to not find the wireless device
      for me.  As far as I can tell, Tejun *meant* for this commit to not make
      any semantic changes, but there clearly are some.  So revert it, taking
      into account some of the calling convention changes that happened in
      this area in subsequent commits.
      
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a1212d27
    • Linus Torvalds's avatar
      Merge tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 0b1e73ed
      Linus Torvalds authored
      Pull staging driver update from Greg KH:
       "Here's the big drivers/staging/ update for 3.13-rc1.
      
        Nothing major here, just a _ton_ of fixes and cleanups, mostly driven
        by the new round of OPW applicants, but also there are lots of other
        people doing staging tree cleanups these days in order to help get the
        drivers into mergable shape.
      
        We also merge, and then revert, the ktap code, as Ingo and the other
        perf/ftrace developers feel it should go into the "real" part of the
        kernel with only a bit more work, so no need to put it in staging for
        now.
      
        All of this has been in linux-next for a while with no reported
        issues"
      
      * tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1045 commits)
        staging: drm/imx: fix return value check in ipu_add_subdevice_pdata()
        Staging: zram: Fix access of NULL pointer
        Staging: zram: Fix variable dereferenced before check
        Staging: rtl8187se: space prohibited before semicolon in r8185b_init.c
        Staging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c
        Staging: rtl8187se: fix braces {} are not necessary for single statement blocks in r8185b_init.c
        Staging: rtl8187se: fix trailing whitespace in r8185b_init.c
        Staging: rtl8187se: fix please, no space before tabs in r8185b_init.c
        drivers/staging/nvec/Kconfig: remove trailing whitespace
        Staging: dwc2: Fix variable dereferenced before check
        Staging: xgifb: fix braces {} are not necessary for any arm of this statement
        staging: rtl8192e: remove unneeded semicolons
        staging: rtl8192e: use true and false for bool variables
        staging: ft1000: return values corrected in scram_start_dwnld
        staging: ft1000: change values of status return variable in write_dpram32_and_check
        staging: bcm: Remove unnecessary pointer casting
        imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity
        staging: r8188eu: Fix sparse warnings in rtl_p2p.c
        staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c
        staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c
        ...
      0b1e73ed
    • Linus Torvalds's avatar
      Merge tag 'tty-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 56edff75
      Linus Torvalds authored
      Pull tty/serial driver updates from Greg KH:
       "Here's the big tty/serial driver update for 3.13-rc1.
      
        There's some more minor n_tty work here, but nothing like previous
        kernel releases.  Also some new driver ids, driver updates for new
        hardware, and other small things.
      
        All of this has been in linux-next for a while with no issues"
      
      * tag 'tty-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (84 commits)
        serial: omap: fix missing comma
        serial: sh-sci: Enable the driver on all ARM platforms
        serial: mfd: Staticize local symbols
        serial: omap: fix a few checkpatch warnings
        serial: omap: improve RS-485 performance
        mrst_max3110: fix unbalanced IRQ issue during resume
        serial: omap: Add support for optional wake-up
        serial: sirf: remove duplicate defines
        tty: xuartps: Fix build error when COMMON_CLK is not set
        tty: xuartps: Fix build error due to missing forward declaration
        tty: xuartps: Fix "may be used uninitialized" build warning
        serial: 8250_pci: add Pericom PCIe Serial board Support (12d8:7952/4/8) - Chip PI7C9X7952/4/8
        tty: xuartps: Update copyright information
        tty: xuartps: Implement suspend/resume callbacks
        tty: xuartps: Dynamically adjust to input frequency changes
        tty: xuartps: Updating set_baud_rate()
        tty: xuartps: Force enable the UART in xuartps_console_write
        tty: xuartps: support 64 byte FIFO size
        tty: xuartps: Add polled mode support for xuartps
        tty: xuartps: Implement BREAK detection, add SYSRQ support
        ...
      56edff75
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.13-rc1' of... · 0324e745
      Linus Torvalds authored
      Merge tag 'driver-core-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core / sysfs patches from Greg KH:
       "Here's the big driver core / sysfs update for 3.13-rc1.
      
        There's lots of dev_groups updates for different subsystems, as they
        all get slowly migrated over to the safe versions of the attribute
        groups (removing userspace races with the creation of the sysfs
        files.) Also in here are some kobject updates, devres expansions, and
        the first round of Tejun's sysfs reworking to enable it to be used by
        other subsystems as a backend for an in-kernel filesystem.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'driver-core-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (83 commits)
        sysfs: rename sysfs_assoc_lock and explain what it's about
        sysfs: use generic_file_llseek() for sysfs_file_operations
        sysfs: return correct error code on unimplemented mmap()
        mdio_bus: convert bus code to use dev_groups
        device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name
        sysfs: separate out dup filename warning into a separate function
        sysfs: move sysfs_hash_and_remove() to fs/sysfs/dir.c
        sysfs: remove unused sysfs_get_dentry() prototype
        sysfs: honor bin_attr.attr.ignore_lockdep
        sysfs: merge sysfs_elem_bin_attr into sysfs_elem_attr
        devres: restore zeroing behavior of devres_alloc()
        sysfs: fix sysfs_write_file for bin file
        input: gameport: convert bus code to use dev_groups
        input: serio: remove bus usage of dev_attrs
        input: serio: use DEVICE_ATTR_RO()
        i2o: convert bus code to use dev_groups
        memstick: convert bus code to use dev_groups
        tifm: convert bus code to use dev_groups
        virtio: convert bus code to use dev_groups
        ipack: convert bus code to use dev_groups
        ...
      0324e745
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 1071ec7b
      Linus Torvalds authored
      Pull char/misc patches from Greg KH:
       "Here's the big char/misc driver patchset for 3.13-rc1.
      
        Lots of stuff in here, including some new drivers for Intel's "MIC"
        co-processor devices, and a new eeprom driver.  Other things include
        the driver attribute cleanups, extcon driver updates, hyperv updates,
        and a raft of other miscellaneous driver fixes.
      
        All of these have been in linux-next for a while"
      
      * tag 'char-misc-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (121 commits)
        misc: mic: Fixes for randconfig build errors and warnings.
        tifm: fix error return code in tifm_7xx1_probe()
        w1-gpio: Use devm_* functions
        w1-gpio: Detect of_gpio_error for first gpio
        uio: Pass pointers to virt_to_page(), not integers
        uio: fix memory leak
        misc/at24: avoid infinite loop on write()
        misc/93xx46: avoid infinite loop on write()
        misc: atmel_pwm: add deferred-probing support
        mei: wd: host_init propagate error codes from called functions
        mei: replace stray pr_debug with dev_dbg
        mei: bus: propagate error code returned by mei_me_cl_by_id
        mei: mei_cl_link remove duplicated check for open_handle_count
        mei: print correct device state during unexpected reset
        mei: nfc: fix memory leak in error path
        lkdtm: add tests for additional page permissions
        lkdtm: adjust recursion size to avoid warnings
        lkdtm: isolate stack corruption test
        mei: move host_clients_map cleanup to device init
        mei: me: downgrade two errors to debug level
        ...
      1071ec7b
    • Linus Torvalds's avatar
      Merge tag 'usb-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c287322c
      Linus Torvalds authored
      Pull USB driver update from Greg KH:
       "Here's the big USB driver update for 3.13-rc1.
      
        It includes the usual xhci changes, EHCI updates to get the scheduling
        of USB transactions working better, and a raft of gadget and musb
        updates as well.
      
        All of this has been in linux-next for a while with no reported
        issues"
      
      * tag 'usb-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (305 commits)
        USB: Maintainers change for usb serial drivers
        usb: usbtest: support container id descriptor test
        usb: usbtest: support superspeed device capbility descriptor test
        usb: usbtest: support usb2 extension descriptor test
        usb: chipidea: only get vbus regulator for non-peripheral mode
        USB: ehci-atmel: add usb_clk for transition to CCF
        usb: cdc-wdm: ignore speed change notifications
        USB: cdc-wdm: support back-to-back USB_CDC_NOTIFY_RESPONSE_AVAILABLE notifications
        usbatm: Fix dynamic_debug / ratelimited atm_dbg and atm_rldbg macros
        printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
        usb: usbtest: support bos descriptor test for usb 3.0
        USB: phy: samsung: Support multiple PHYs of same type
        usb: wusbcore: change WA_SEGS_MAX to a legal value
        usb: wusbcore: add a quirk for Alereon HWA device isoc behavior
        usb: wusbcore: combine multiple isoc frames in a single transfer request.
        usb: wusbcore: set the RPIPE wMaxPacketSize value correctly
        usb: chipidea: host: more enhancement when ci->hcd is NULL
        usb: ohci: remove ep93xx bus glue platform driver
        usb: usbtest: fix checkpatch warning as sizeof code style
        UWB: clean up attribute use by using ATTRIBUTE_GROUPS()
        ...
      c287322c
  4. 06 Nov, 2013 6 commits
  5. 05 Nov, 2013 5 commits
  6. 04 Nov, 2013 9 commits
    • Trond Myklebust's avatar
      NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security · fab99ebe
      Trond Myklebust authored
      We already check for nfs_server_capable(inode, NFS_CAP_SECURITY_LABEL)
      in nfs4_label_alloc()
      We check the minor version in _nfs4_server_capabilities before setting
      NFS_CAP_SECURITY_LABEL.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      fab99ebe
    • Trond Myklebust's avatar
      NFSv4: Sanity check the server reply in _nfs4_server_capabilities · b944dba3
      Trond Myklebust authored
      We don't want to be setting capabilities and/or requesting attributes
      that are not appropriate for the NFSv4 minor version.
      
      - Ensure that we clear the NFS_CAP_SECURITY_LABEL capability when appropriate
      - Ensure that we limit the attribute bitmasks to the mounted_on_fileid
        attribute and less for NFSv4.0
      - Ensure that we limit the attribute bitmasks to suppattr_exclcreat and
        less for NFSv4.1
      - Ensure that we limit it to change_sec_label or less for NFSv4.2
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      b944dba3
    • Trond Myklebust's avatar
      NFSv4.2: encode_readdir - only ask for labels when doing readdirplus · d204c5d2
      Trond Myklebust authored
      Currently, if the server is doing NFSv4.2 and supports labeled NFS, then
      our on-the-wire READDIR request ends up asking for the label information,
      which is then ignored unless we're doing readdirplus.
      This patch ensures that READDIR doesn't ask the server for label information
      at all unless the readdir->bitmask contains the FATTR4_WORD2_SECURITY_LABEL
      attribute, and the readdir->plus flag is set.
      
      While we're at it, optimise away the 3rd bitmap field if it is zero.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      d204c5d2
    • Jeff Layton's avatar
      nfs: set security label when revalidating inode · 3da580aa
      Jeff Layton authored
      Currently, we fetch the security label when revalidating an inode's
      attributes, but don't apply it. This is in contrast to the readdir()
      codepath where we do apply label changes.
      
      Cc: Dave Quigley <dpquigl@davequigley.com>
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      3da580aa
    • Trond Myklebust's avatar
      NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec · f3f5a0f8
      Trond Myklebust authored
      In the spec, the security label attribute id is '80', which means that
      it should be bit number 80-64 == 16 in the 3rd word of the bitmap.
      
      Fixes: 4488cc96: NFS: Add NFSv4.2 protocol constants
      Cc: J. Bruce Fields <bfields@fieldses.org>
      Cc: Steve Dickson <steved@redhat.com>
      Cc: stable@vger.kernel.org # 3.11+
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      f3f5a0f8
    • Marc Zyngier's avatar
      arm64: move enabling of GIC before CPUs are set online · 7ade67b5
      Marc Zyngier authored
      Commit 53ae3acd (arm64: Only enable local interrupts after the CPU
      is marked online) moved the enabling of the GIC after the CPUs are
      marked online.
      
      This has some interesting effect:
      [...]
      [<ffffffc0002eefd8>] gic_raise_softirq+0xf8/0x160
      [<ffffffc000088f58>] smp_send_reschedule+0x38/0x40
      [<ffffffc0000c8728>] resched_task+0x84/0xc0
      [<ffffffc0000c8cdc>] check_preempt_curr+0x58/0x98
      [<ffffffc0000c8d38>] ttwu_do_wakeup+0x1c/0xf4
      [<ffffffc0000c8f90>] ttwu_do_activate.constprop.84+0x64/0x70
      [<ffffffc0000cad30>] try_to_wake_up+0x1d4/0x2b4
      [<ffffffc0000cae6c>] default_wake_function+0x10/0x18
      [<ffffffc0000c5ca4>] __wake_up_common+0x60/0xa0
      [<ffffffc0000c7784>] complete+0x48/0x64
      [<ffffffc000088bec>] secondary_start_kernel+0xe8/0x110
      [...]
      
      Here, we end-up calling gic_raise_softirq without having initialized
      the interrupt controller for this CPU. While this goes unnoticed
      with GICv2 (the distributor is always accessible), it explodes with
      GICv3.
      
      The fix is to move the call to notify_cpu_starting before we set
      the secondary CPU online.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      7ade67b5
    • Mark Salter's avatar
      arm64: use generic RW_DATA_SECTION macro in linker script · 3c620626
      Mark Salter authored
      The .data section in the arm64 linker script currently lacks a
      definition for page-aligned data. This leads to a .page_aligned
      section being placed between the end of data and start of bss.
      This patch corrects that by using the generic RW_DATA_SECTION
      macro which includes support for page-aligned data.
      Signed-off-by: default avatarMark Salter <msalter@redhat.com>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      3c620626
    • Maciej W. Rozycki's avatar
      MIPS: Random whitespace clean-ups · edf7b938
      Maciej W. Rozycki authored
      Another whitespace clean-up, this removes tabs from between sentences in
      some comments.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@codesourcery.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6103/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      edf7b938
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · be408cd3
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "I'm sending a pull request of these lingering bug fixes for networking
        before the normal merge window material because some of this stuff I'd
        like to get to -stable ASAP"
      
       1) cxgb3 stopped working on 32-bit machines, fix from Ben Hutchings.
      
       2) Structures passed via netlink for netfilter logging are not fully
          initialized.  From Mathias Krause.
      
       3) Properly unlink upper openvswitch device during notifications, from
          Alexei Starovoitov.
      
       4) Fix race conditions involving access to the IP compression scratch
          buffer, from Michal Kubrecek.
      
       5) We don't handle the expiration of MTU information contained in ipv6
          routes sometimes, fix from Hannes Frederic Sowa.
      
       6) With Fast Open we can miscompute the TCP SYN/ACK RTT, from Yuchung
          Cheng.
      
       7) Don't take TCP RTT sample when an ACK doesn't acknowledge new data,
          also from Yuchung Cheng.
      
       8) The decreased IPSEC garbage collection threshold causes problems for
          some people, bump it back up.  From Steffen Klassert.
      
       9) Fix skb->truesize calculated by tcp_tso_segment(), from Eric
          Dumazet.
      
      10) flow_dissector doesn't validate packet lengths sufficiently, from
          Jason Wang
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        net/mlx4_core: Fix call to __mlx4_unregister_mac
        net: sctp: do not trigger BUG_ON in sctp_cmd_delete_tcb
        net: flow_dissector: fail on evil iph->ihl
        xfrm: Fix null pointer dereference when decoding sessions
        can: kvaser_usb: fix usb endpoints detection
        can: c_can: Fix RX message handling, handle lost message before EOB
        doc:net: Fix typo in Documentation/networking
        bgmac: don't update slot on skb alloc/dma mapping error
        ibm emac: Fix locking for enable/disable eob irq
        ibm emac: Don't call napi_complete if napi_reschedule failed
        virtio-net: correctly handle cpu hotplug notifier during resuming
        bridge: pass correct vlan id to multicast code
        net: x25: Fix dead URLs in Kconfig
        netfilter: xt_NFQUEUE: fix --queue-bypass regression
        xen-netback: use jiffies_64 value to calculate credit timeout
        cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures
        bnx2x: Disable VF access on PF removal
        bnx2x: prevent FW assert on low mem during unload
        tcp: gso: fix truesize tracking
        xfrm: Increase the garbage collector threshold
        ...
      be408cd3