1. 30 Nov, 2014 4 commits
  2. 22 Nov, 2014 1 commit
  3. 20 Oct, 2014 2 commits
    • Linus Torvalds's avatar
      Linux 3.18-rc1 · f114040e
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4d3639ac
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A batch of fixes that have come in during the merge window.
        Some of them are defconfig updates for things that have now landed,
        some errata additions and a few general scattered fixes.
        There's also a qcom DT update that adds support for SATA on AP148, and
        basic support for Sony Xperia Z1 and CM-QS600 platforms that seemed
        isolated enough that we could merge it even if it's late"
      * tag 'arm-soc-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: corrected bcm2835 search
        ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
        ARM: dts: Explicitly set dr_mode on exynos Peach boards
        ARM: dts: qcom: add CM-QS600 board
        ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
        ARM: dts: qcom: Add SATA support on IPQ8064/AP148
        MAINTAINERS: Update Santosh Shilimkar's email id
        ARM: sunxi_defconfig: enable CONFIG_REGULATOR
        ARM: dts: Disable smc91x on n900 until bootloader dependency is removed
        ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3
        ARM: exynos_defconfig: enable USB gadget support
        ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers
        ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
        ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
        ARM: SAMSUNG: Restore Samsung PM Debug functionality
        ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
        ARM: exynos_defconfig: Enable SBS battery support
        ARM: exynos_defconfig: Enable Control Groups support
        ARM: exynos_defconfig: Enable Atmel maXTouch support
        ARM: exynos_defconfig: Enable MAX77802
  4. 19 Oct, 2014 17 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/users/eparis/audit · ab074ade
      Linus Torvalds authored
      Pull audit updates from Eric Paris:
       "So this change across a whole bunch of arches really solves one basic
        problem.  We want to audit when seccomp is killing a process.  seccomp
        hooks in before the audit syscall entry code.  audit_syscall_entry
        took as an argument the arch of the given syscall.  Since the arch is
        part of what makes a syscall number meaningful it's an important part
        of the record, but it isn't available when seccomp shoots the
        For most arch's we have a better way to get the arch (syscall_get_arch)
        So the solution was two fold: Implement syscall_get_arch() everywhere
        there is audit which didn't have it.  Use syscall_get_arch() in the
        seccomp audit code.  Having syscall_get_arch() everywhere meant it was
        a useless flag on the stack and we could get rid of it for the typical
        syscall entry.
        The other changes inside the audit system aren't grand, fixed some
        records that had invalid spaces.  Better locking around the task comm
        field.  Removing some dead functions and structs.  Make some things
        static.  Really minor stuff"
      * git://git.infradead.org/users/eparis/audit: (31 commits)
        audit: rename audit_log_remove_rule to disambiguate for trees
        audit: cull redundancy in audit_rule_change
        audit: WARN if audit_rule_change called illegally
        audit: put rule existence check in canonical order
        next: openrisc: Fix build
        audit: get comm using lock to avoid race in string printing
        audit: remove open_arg() function that is never used
        audit: correct AUDIT_GET_FEATURE return message type
        audit: set nlmsg_len for multicast messages.
        audit: use union for audit_field values since they are mutually exclusive
        audit: invalid op= values for rules
        audit: use atomic_t to simplify audit_serial()
        kernel/audit.c: use ARRAY_SIZE instead of sizeof/sizeof[0]
        audit: reduce scope of audit_log_fcaps
        audit: reduce scope of audit_net_id
        audit: arm64: Remove the audit arch argument to audit_syscall_entry
        arm64: audit: Add audit hook in syscall_trace_enter/exit()
        audit: x86: drop arch from __audit_syscall_entry() interface
        sparc: implement is_32bit_task
        sparc: properly conditionalize use of TIF_32BIT
    • Olof Johansson's avatar
      Merge tag 'qcom-dt-for-3.18-3' of... · 57764512
      Olof Johansson authored
      Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into fixes
      Merge "qcom DT changes for v3.18-3" from Kumar Gala:
      Qualcomm ARM Based Device Tree Updates for v3.18-3
      * Added Board support for CM-QS600 and Sony Xperia Z1 phone
      * Added SATA support on IPQ8064/AP148
      * tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
        ARM: dts: qcom: add CM-QS600 board
        ARM: dts: qcom: Add initial DTS file for Sony Xperia Z1 phone
        ARM: dts: qcom: Add SATA support on IPQ8064/AP148
    • Olof Johansson's avatar
      Merge tag 'samsung-fixes-2' of... · e29c6486
      Olof Johansson authored
      Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      Pull more fixes from Kukjin Kim:
      2nd Samsung fixes for v3.18
      - Explicitly set dr_mode on exynos5800-peach-pi, exynos5420-peach-pit
        and exynos5420-arndale-octa boards, because the USB dwc3 controller
        will not work properly without dr_mode as host on above boards if
        the USB host and gadget are enabled in kernel configuration both.
      * tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
        ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
        ARM: dts: Explicitly set dr_mode on exynos Peach boards
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Scott Branden's avatar
      MAINTAINERS: corrected bcm2835 search · 9209bec4
      Scott Branden authored
      Corrected bcm2835 maintainer info by using N: to specify any files with
      bcm2835 in are directed to the proper maintainer.
      Also corrected minor mispelling of ARCHITECTURE in 2 comment locations.
      Signed-off-by: default avatarScott Branden <sbranden@broadcom.com>
      Signed-off-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Linus Torvalds's avatar
      Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb · 61ed53de
      Linus Torvalds authored
      Pull ntb (non-transparent bridge) updates from Jon Mason:
       "Add support for Haswell NTB split BARs, a debugfs entry for basic
        debugging info, and some code clean-ups"
      * tag 'ntb-3.18' of git://github.com/jonmason/ntb:
        ntb: Adding split BAR support for Haswell platforms
        ntb: use errata flag set via DID to implement workaround
        ntb: conslidate reading of PPD to move platform detection earlier
        ntb: move platform detection to separate function
        NTB: debugfs device entry
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 278f1d07
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       "Highlights from the I2C subsystem for 3.18:
         - new drivers for Axxia AM55xx, and Hisilicon hix5hd2 SoC.
         - designware driver gained AMD support, exynos gained exynos7 support
        The rest is usual driver stuff.  Hopefully no lowlights this time"
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: i801: Add Device IDs for Intel Sunrise Point PCH
        i2c: hix5hd2: add i2c controller driver
        i2c-imx: Disable the clock on probe failure
        i2c: designware: Add support for AMD I2C controller
        i2c: designware: Rework probe() to get clock a bit later
        i2c: designware: Default to fast mode in case of ACPI
        i2c: axxia: Add I2C driver for AXM55xx
        i2c: exynos: add support for HSI2C module on Exynos7
        i2c: mxs: detect No Slave Ack on SELECT in PIO mode
        i2c: cros_ec: Remove EC_I2C_FLAG_10BIT
        i2c: cros-ec-tunnel: Add of match table
        i2c: rcar: remove sign-compare flaw
        i2c: ismt: Use minimum descriptor size
        i2c: imx: Add arbitration lost check
        i2c: rk3x: Remove unlikely() annotations
        i2c: rcar: check for no IRQ in rcar_i2c_irq()
        i2c: rcar: make rcar_i2c_prepare_msg() *void*
        i2c: rcar: simplify check for last message
        i2c: designware: add support of platform data to set I2C mode
        i2c: designware: add support of I2C standard mode
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d590c6cd
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a collection of small fixes after 3.18 merge.
        The urgent one is the fix for kernel panics with linked PCM substream
        triggered by the recent nonatomic PCM ops support.  Other two fixes
        (emu10k1 and bebob) are stable fixes, and one easy PCI ID addition for
        a new Intel HD-audio controller"
      * tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda_intel: Add Device IDs for Intel Sunrise Point PCH
        ALSA: emu10k1: Fix deadlock in synth voice lookup
        ALSA: pcm: Fix referred substream in snd_pcm_action_group() unlock loop
        ALSA: bebob: Fix failure to detect source of clock for Terratec Phase 88
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fb378df5
      Linus Torvalds authored
      Pull second round of input updates from Dmitry Torokhov:
       "Mostly simple bug fixes, although we do have one brand new driver for
        Microchip AR1021 i2c touchscreen.
        Also there is the change to stop trying to use i8042 active
        multiplexing by default (it is still possible to activate it via
        i8042.nomux=0 on boxes that implement it)"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xpad - add Thrustmaster as Xbox 360 controller vendor
        Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing Wheel
        Input: max77693-haptic - fix state check in imax77693_haptic_disable()
        Input: xen-kbdfront - free grant table entry in xenkbd_disconnect_backend
        Input: alps - fix v4 button press recognition
        Input: i8042 - disable active multiplexing by default
        Input: i8042 - add noloop quirk for Asus X750LN
        Input: synaptics - gate forcepad support by DMI check
        Input: Add Microchip AR1021 i2c touchscreen
        Input: cros_ec_keyb - add of match table
        Input: serio - avoid negative serio device numbers
        Input: avoid negative input device numbers
        Input: automatically set EV_ABS bit in input_set_abs_params
        Input: adp5588-keys - cancel workqueue in failure path
        Input: opencores-kbd - switch to using managed resources
        Input: evdev - fix EVIOCG{type} ioctl
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 2eb7f910
      Linus Torvalds authored
      Pull infiniband/RDMA updates from Roland Dreier:
       - large set of iSER initiator improvements
       - hardware driver fixes for cxgb4, mlx5 and ocrdma
       - small fixes to core midlayer
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (47 commits)
        RDMA/cxgb4: Fix ntuple calculation for ipv6 and remove duplicate line
        RDMA/cxgb4: Add missing neigh_release in find_route
        RDMA/cxgb4: Take IPv6 into account for best_mtu and set_emss
        RDMA/cxgb4: Make c4iw_wr_log_size_order static
        IB/core: Fix XRC race condition in ib_uverbs_open_qp
        IB/core: Clear AH attr variable to prevent garbage data
        RDMA/ocrdma: Save the bit environment, spare unncessary parenthesis
        RDMA/ocrdma: The kernel has a perfectly good BIT() macro - use it
        RDMA/ocrdma: Don't memset() buffers we just allocated with kzalloc()
        RDMA/ocrdma: Remove a unused-label warning
        RDMA/ocrdma: Convert kernel VA to PA for mmap in user
        RDMA/ocrdma: Get vlan tag from ib_qp_attrs
        RDMA/ocrdma: Add default GID at index 0
        IB/mlx5, iser, isert: Add Signature API additions
        Target/iser: Centralize ib_sig_domain setting
        IB/iser: Centralize ib_sig_domain settings
        IB/mlx5: Use extended internal signature layout
        IB/iser: Set IP_CSUM as default guard type
        IB/iser: Remove redundant assignment
        IB/mlx5: Use enumerations for PI copy mask
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1f6075f9
      Linus Torvalds authored
      Pull more perf updates from Ingo Molnar:
       "A second (and last) round of late coming fixes and changes, almost all
        of them in perf tooling:
        User visible tooling changes:
         - Add period data column and make it default in 'perf script' (Jiri
         - Add a visual cue for toggle zeroing of samples in 'perf top'
           (Taeung Song)
         - Improve callchains when using libunwind (Namhyung Kim)
        Tooling fixes and infrastructure changes:
         - Fix for double free in 'perf stat' when using some specific invalid
           command line combo (Yasser Shalabi)
         - Fix off-by-one bugs in map->end handling (Stephane Eranian)
         - Fix off-by-one bug in maps__find(), also related to map->end
           handling (Namhyung Kim)
         - Make struct symbol->end be the first addr after the symbol range,
           to make it match the convention used for struct map->end.  (Arnaldo
           Carvalho de Melo)
         - Fix perf_evlist__add_pollfd() error handling in 'perf kvm stat
           live' (Jiri Olsa)
         - Fix python test build by moving callchain_param to an object linked
           into the python binding (Jiri Olsa)
         - Document sysfs events/ interfaces (Cody P Schafer)
         - Fix typos in perf/Documentation (Masanari Iida)
         - Add missing 'struct option' forward declaration (Arnaldo Carvalho
           de Melo)
         - Add option to copy events when queuing for sorting across cpu
           buffers and enable it for 'perf kvm stat live', to avoid having
           events left in the queue pointing to the ring buffer be rewritten
           in high volume sessions.  (Alexander Yarygin, improving work done
           by David Ahern):
         - Do not include a struct hists per perf_evsel, untangling the
           histogram code from perf_evsel, to pave the way for exporting a
           minimalistic tools/lib/api/perf/ library usable by tools/perf and
           initially by the rasd daemon being developed by Borislav Petkov,
           Robert Richter and Jean Pihet.  (Arnaldo Carvalho de Melo)
         - Make perf_evlist__open(evlist, NULL, NULL), i.e. without cpu and
           thread maps mean syswide monitoring, reducing the boilerplate for
           tools that only want system wide mode.  (Arnaldo Carvalho de Melo)
         - Move exit stuff from perf_evsel__delete to perf_evsel__exit, delete
           should be just a front end for exit + free (Arnaldo Carvalho de
         - Add support to new style format of kernel PMU event.  (Kan Liang)
        and other misc fixes"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
        perf script: Add period as a default output column
        perf script: Add period data column
        perf evsel: No need to drag util/cgroup.h
        perf evlist: Add missing 'struct option' forward declaration
        perf evsel: Move exit stuff from __delete to __exit
        kprobes/x86: Remove stale ARCH_SUPPORTS_KPROBES_ON_FTRACE define
        perf kvm stat live: Enable events copying
        perf session: Add option to copy events when queueing
        perf Documentation: Fix typos in perf/Documentation
        perf trace: Use thread_{,_set}_priv helpers
        perf kvm: Use thread_{,_set}_priv helpers
        perf callchain: Create an address space per thread
        perf report: Set callchain_param.record_mode for future use
        perf evlist: Fix for double free in tools/perf stat
        perf test: Add test case for pmu event new style format
        perf tools: Add support to new style format of kernel PMU event
        perf tools: Parse the pmu event prefix and suffix
        Revert "perf tools: Default to cpu// for events v5"
        perf Documentation: Remove Ruplicated docs for powerpc cpu specific events
        perf Documentation: sysfs events/ interfaces
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 5e2ee7cd
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Here we have two bug fixes:
        1) The current thread's fault_code is not setup properly upon entry to
           do_sparc64_fault() in some paths, leading to spurious SIGBUS.
        2) Don't use a zero length array at the end of thread_info on sparc64,
           otherwise end_of_stack() isn't right"
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Do not define thread fpregs save area as zero-length array.
        sparc64: Fix corrupted thread fault code.
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e25b4927
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "A quick batch of bug fixes:
        1) Fix build with IPV6 disabled, from Eric Dumazet.
        2) Several more cases of caching SKB data pointers across calls to
           pskb_may_pull(), thus referencing potentially free'd memory.  From
           Li RongQing.
        3) DSA phy code tests operation presence improperly, instead of going:
              if (x->ops->foo)
                      r = x->ops->foo(args);
           it was going:
              if (x->ops->foo(args))
                      r = x->ops->foo(args);
         Fix from Andew Lunn"
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        Net: DSA: Fix checking for get_phy_flags function
        ipv6: fix a potential use after free in sit.c
        ipv6: fix a potential use after free in ip6_offload.c
        ipv4: fix a potential use after free in gre_offload.c
        tcp: fix build error if IPv6 is not enabled
    • Andrew Lunn's avatar
      Net: DSA: Fix checking for get_phy_flags function · 228b16cb
      Andrew Lunn authored
      The check for the presence or not of the optional switch function
      get_phy_flags() called the function, rather than checked to see if it
      is a NULL pointer. This causes a derefernce of a NULL pointer on all
      switch chips except the sf2, the only switch to implement this call.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Fixes: 6819563e
       ("net: dsa: allow switch drivers to specify phy_device::dev_flags")
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      sparc64: Do not define thread fpregs save area as zero-length array. · e2653143
      David S. Miller authored
      This breaks the stack end corruption detection facility.
      What that facility does it write a magic value to "end_of_stack()"
      and checking to see if it gets overwritten.
      "end_of_stack()" is "task_thread_info(p) + 1", which for sparc64 is
      the beginning of the FPU register save area.
      So once the user uses the FPU, the magic value is overwritten and the
      debug checks trigger.
      Fix this by making the size explicit.
      Due to the size we use for the fpsaved[], gsr[], and xfsr[] arrays we
      are limited to 7 levels of FPU state saves.  So each FPU register set
      is 256 bytes, allocate 256 * 7 for the fpregs area.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      sparc64: Fix corrupted thread fault code. · 84bd6d8b
      David S. Miller authored
      Every path that ends up at do_sparc64_fault() must install a valid
      FAULT_CODE_* bitmask in the per-thread fault code byte.
      Two paths leading to the label winfix_trampoline (which expects the
      FAULT_CODE_* mask in register %g4) were not doing so:
      1) For pre-hypervisor TLB protection violation traps, if we took
         the 'winfix_trampoline' path we wouldn't have %g4 initialized
         with the FAULT_CODE_* value yet.  Resulting in using the
         TLB_TAG_ACCESS register address value instead.
      2) In the TSB miss path, when we notice that we are going to use a
         hugepage mapping, but we haven't allocated the hugepage TSB yet, we
         still have to take the window fixup case into consideration and
         in that particular path we leave %g4 not setup properly.
      Errors on this sort were largely invisible previously, but after
      commit 4ccb9272 ("sparc64: sun4v TLB
      error power off events") we now have a fault_code mask bit
      (FAULT_CODE_BAD_RA) that triggers due to this bug.
      FAULT_CODE_BAD_RA triggers because this bit is set in TLB_TAG_ACCESS
      (see #1 above) and thus we get seemingly random bus errors triggered
      for user processes.
      Fixes: 4ccb9272
       ("sparc64: sun4v TLB error power off events")
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · 52d589a0
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       "For dmaengine contributions we have:
         - designware cleanup by Andy
         - my series moving device_control users to dmanegine_xxx APIs for
           later removal of device_control API
         - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
        serial: atmel: add missing dmaengine header
        dmaengine: remove FSLDMA_EXTERNAL_START
        dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
        carma-fpga: move to fsl_dma_external_start()
        carma-fpga: use dmaengine_xxx() API
        dmaengine: freescale: add and export fsl_dma_external_start()
        dmaengine: add dmaengine_prep_dma_sg() helper
        video: mx3fb: use dmaengine_terminate_all() API
        serial: sh-sci: use dmaengine_terminate_all() API
        net: ks8842: use dmaengine_terminate_all() API
        mtd: sh_flctl: use dmaengine_terminate_all() API
        mtd: fsmc_nand: use dmaengine_terminate_all() API
        V4L2: mx3_camer: use dmaengine_pause() API
        dmaengine: coh901318: use dmaengine_terminate_all() API
        pata_arasan_cf: use dmaengine_terminate_all() API
        dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
        dmaengine: dw: export probe()/remove() and Co to users
        dmaengine: dw: enable and disable controller when needed
        dmaengine: dw: always export dw_dma_{en,dis}able
        dmaengine: dw: introduce dw_dma_on() helper
    • Linus Torvalds's avatar
      Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 0a582821
      Linus Torvalds authored
      Pull fbdev updates from Tomi Valkeinen:
       - new 6x10 font
       - various small fixes and cleanups
      * tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (30 commits)
        fonts: Add 6x10 font
        videomode: provide dummy inline functions for !CONFIG_OF
        video/atmel_lcdfb: Introduce regulator support
        fbdev: sh_mobile_hdmi: Re-init regs before irq re-enable on resume
        framebuffer: fix screen corruption when copying
        framebuffer: fix border color
        arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
        arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss
        video: fbdev: valkyriefb.c: use container_of to resolve fb_info_valkyrie from fb_info
        video: fbdev: pxafb.c: use container_of to resolve pxafb_info/layer from fb_info
        video: fbdev: cyber2000fb.c: use container_of to resolve cfb_info from fb_info
        video: fbdev: controlfb.c: use container_of to resolve fb_info_control from fb_info
        video: fbdev: sa1100fb.c: use container_of to resolve sa1100fb_info from fb_info
        video: fbdev: stifb.c: use container_of to resolve stifb_info from fb_info
        video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy
        video: valkyriefb: Fix unused variable warning in set_valkyrie_clock()
        video: fbdev: use %*ph specifier to dump small buffers
        video: mx3fb: always enable BACKLIGHT_LCD_SUPPORT
        video: fbdev: au1200fb: delete double assignment
        video: fbdev: sis: delete double assignment
  5. 18 Oct, 2014 16 commits
    • Linus Torvalds's avatar
      Merge tag 'kvm-arm-for-3.18-take-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm · 8a5de182
      Linus Torvalds authored
      Pull second batch of changes for KVM/{arm,arm64} from Marc Zyngier:
       "The most obvious thing is the sizeable MMU changes to support 48bit
        VAs on arm64.
         - support for 48bit IPA and VA (EL2)
         - a number of fixes for devices mapped into guests
         - yet another VGIC fix for BE
         - a fix for CPU hotplug
         - a few compile fixes (disabled VGIC, strict mm checks)"
      [ I'm pulling directly from Marc at the request of Paolo Bonzini, whose
        backpack was stolen at Düsseldorf airport and will do new keys and
        rebuild his web of trust.    - Linus ]
      * tag 'kvm-arm-for-3.18-take-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm:
        arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs
        arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort
        arm/arm64: KVM: Ensure memslots are within KVM_PHYS_SIZE
        arm64: KVM: Implement 48 VA support for KVM EL2 and Stage-2
        arm/arm64: KVM: map MMIO regions at creation time
        arm64: kvm: define PAGE_S2_DEVICE as read-only by default
        ARM: kvm: define PAGE_S2_DEVICE as read-only by default
        arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap
        arm/arm64: KVM: fix potential NULL dereference in user_mem_abort()
        arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages
        ARM: KVM: fix vgic-disabled build
        arm: kvm: fix CPU hotplug
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 857b50f5
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the MIPS pull request for the next kernel:
         - Zubair's patch series adds CMA support for MIPS.  Doing so it also
           touches ARM64 and x86.
         - remove the last instance of IRQF_DISABLED from arch/mips
         - updates to two of the MIPS defconfig files.
         - cleanup of how cache coherency bits are handled on MIPS and
           implement support for write-combining.
         - platform upgrades for Alchemy
         - move MIPS DTS files to arch/mips/boot/dts/"
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits)
        MIPS: ralink: remove deprecated IRQF_DISABLED
        MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS
        MIPS: cpu-probe: Set the write-combine CCA value on per core basis
        MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores
        MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks
        MIPS: DMA: Add cma support
        x86: use generic dma-contiguous.h
        arm64: use generic dma-contiguous.h
        asm-generic: Add dma-contiguous.h
        MIPS: BPF: Add new emit_long_instr macro
        MIPS: ralink: Move device-trees to arch/mips/boot/dts/
        MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/
        MIPS: sead3: Move device-trees to arch/mips/boot/dts/
        MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/
        MIPS: Octeon: Move device-trees to arch/mips/boot/dts/
        MIPS: Add support for building device-tree binaries
        MIPS: Create common infrastructure for building built-in device-trees
        MIPS: SEAD3: Enable DEVTMPFS
        MIPS: SEAD3: Regenerate defconfigs
        MIPS: Alchemy: DB1300: Add touch penirq support
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 168f07a1
      Linus Torvalds authored
      Pull powerpc fix from Michael Ellerman:
       "There was a bit of a misunderstanding between us and the ARM guys in
        the device tree PCI code, which is breaking virtio on powerpc.
        This is the minimal fix until we can sort it out properly"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/pci: Fix IO space breakage after of_pci_range_to_resource() change
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 9272f2dc
      Linus Torvalds authored
      Pull cifs/smb3 updates from Steve French:
       "Improved SMB3 support (symlink and device emulation, and remapping by
        default the 7 reserved posix characters) and a workaround for cifs
        mounts to Mac (working around a commonly encountered Mac server bug)"
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        [CIFS] Remove obsolete comment
        Check minimum response length on query_network_interface
        Workaround Mac server problem
        Remap reserved posix characters by default (part 3/3)
        Allow conversion of characters in Mac remap range (part 2)
        Allow conversion of characters in Mac remap range. Part 1
        mfsymlinks support for SMB2.1/SMB3. Part 2 query symlink
        Add mfsymlinks support for SMB2.1/SMB3. Part 1 create symlink
        Allow mknod and mkfifo on SMB2/SMB3 mounts
        add defines for two new file attributes
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · e83e4323
      Linus Torvalds authored
      Pull dlm fix from David Teigland:
       "This includes a single commit fixing a missing endian conversion"
      * tag 'dlm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: fix missing endian conversion of rcom_status flags
    • Linus Torvalds's avatar
      Merge branch 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ef161ea1
      Linus Torvalds authored
      Pull btrfs data corruption fix from Chris Mason:
       "I'm testing a pull with more fixes, but wanted to get this one out so
        Greg can pick it up.
        The corruption isn't easy to hit, you have to do a readonly snapshot
        and have orphans in the snapshot.  But my review and testing missed
        the bug.  Filipe has added a better xfstest to cover it"
      * 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Revert "Btrfs: race free update of commit root for ro snapshots"
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 8ccf863f
      Linus Torvalds authored
      Pull pstore fix from Tony Luck:
       "Ensure unique filenames in pstore"
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: Fix duplicate {console,ftrace}-efi entries
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs · 4869447d
      Linus Torvalds authored
      Pull NTFS update from Anton Altaparmakov:
       "Here is a small NTFS update notably implementing FIBMAP ioctl for NTFS
        by adding the bmap address space operation.  People seem to still want
      * git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs:
        NTFS: Bump version to 2.1.31.
        NTFS: Add bmap address space operation needed for FIBMAP ioctl.
        NTFS: Remove changelog from Documentation/filesystems/ntfs.txt.
        NTFS: Split ntfs_aops into ntfs_normal_aops and ntfs_compressed_aops in preparation for them diverging.
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · ead13aee
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
        Stable fixes:
         - fix an uninitialised pointer Oops in the writeback error path
         - fix a bogus warning (and early exit from the loop) in nfs_generic_pgio()
         - Add NFSv4.2 SEEK feature and client support for lseek(SEEK_HOLE/SEEK_DATA)
        Other fixes:
         - pnfs: replace broken pnfs_put_lseg_async
         - Remove dead prototype for nfs4_insert_deviceid_node"
      * tag 'nfs-for-3.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: Fix a bogus warning in nfs_generic_pgio
        NFS: Fix an uninitialised pointer Oops in the writeback error path
        NFSv4.1/pnfs: replace broken pnfs_put_lseg_async
        NFSv4: Remove dead prototype for nfs4_insert_deviceid_node()
        NFS: Implement SEEK
    • Linus Torvalds's avatar
      Merge tag 'dm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 929254d8
      Linus Torvalds authored
      Pull device-mapper updates from Mike Snitzer:
       "I rebased the DM tree ontop of linux-block.git's 'for-3.18/core' at
        the beginning of October because DM core now depends on the newly
        introduced bioset_create_nobvec() interface.
         - fix DM's long-standing excessive use of memory by leveraging the
           new bioset_create_nobvec() interface when creating the DM's bioset
         - fix a few bugs in dm-bufio and dm-log-userspace
         - add DM core support for a DM multipath use-case that requires
           loading DM tables that contain devices that have failed (by
           allowing active and inactive DM tables to share dm_devs)
         - add discard support to the DM raid target; like MD raid456 the user
           must opt-in to raid456 discard support be specifying the
           devices_handle_discard_safely=Y module param"
      * tag 'dm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
        dm bufio: when done scanning return from __scan immediately
        dm bufio: update last_accessed when relinking a buffer
        dm raid: add discard support for RAID levels 4, 5 and 6
        dm raid: add discard support for RAID levels 1 and 10
        dm: allow active and inactive tables to share dm_devs
        dm mpath: stop queueing IO when no valid paths exist
        dm: use bioset_create_nobvec()
        dm: remove nr_iovecs parameter from alloc_tio()
    • Linus Torvalds's avatar
      Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block · e75437fb
      Linus Torvalds authored
      Pull block layer driver update from Jens Axboe:
       "This is the block driver pull request for 3.18.  Not a lot in there
        this round, and nothing earth shattering.
         - A round of drbd fixes from the linbit team, and an improvement in
           asender performance.
         - Removal of deprecated (and unused) IRQF_DISABLED flag in rsxx and
           hd from Michael Opdenacker.
         - Disable entropy collection from flash devices by default, from Mike
         - A small collection of xen blkfront/back fixes from Roger Pau Monné
           and Vitaly Kuznetsov"
      * 'for-3.18/drivers' of git://git.kernel.dk/linux-block:
        block: disable entropy contributions for nonrot devices
        xen, blkfront: factor out flush-related checks from do_blkif_request()
        xen-blkback: fix leak on grant map error path
        xen/blkback: unmap all persistent grants when frontend gets disconnected
        rsxx: Remove deprecated IRQF_DISABLED
        block: hd: remove deprecated IRQF_DISABLED
        drbd: use RB_DECLARE_CALLBACKS() to define augment callbacks
        drbd: compute the end before rb_insert_augmented()
        drbd: Add missing newline in resync progress display in /proc/drbd
        drbd: reduce lock contention in drbd_worker
        drbd: Improve asender performance
        drbd: Get rid of the WORK_PENDING macro
        drbd: Get rid of the __no_warn and __cond_lock macros
        drbd: Avoid inconsistent locking warning
        drbd: Remove superfluous newline from "resync_extents" debugfs entry.
        drbd: Use consistent names for all the bi_end_io callbacks
        drbd: Use better variable names
    • Linus Torvalds's avatar
      Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block · d3dc366b
      Linus Torvalds authored
      Pull core block layer changes from Jens Axboe:
       "This is the core block IO pull request for 3.18.  Apart from the new
        and improved flush machinery for blk-mq, this is all mostly bug fixes
        and cleanups.
         - blk-mq timeout updates and fixes from Christoph.
         - Removal of REQ_END, also from Christoph.  We pass it through the
           ->queue_rq() hook for blk-mq instead, freeing up one of the request
           bits.  The space was overly tight on 32-bit, so Martin also killed
           REQ_KERNEL since it's no longer used.
         - blk integrity updates and fixes from Martin and Gu Zheng.
         - Update to the flush machinery for blk-mq from Ming Lei.  Now we
           have a per hardware context flush request, which both cleans up the
           code should scale better for flush intensive workloads on blk-mq.
         - Improve the error printing, from Rob Elliott.
         - Backing device improvements and cleanups from Tejun.
         - Fixup of a misplaced rq_complete() tracepoint from Hannes.
         - Make blk_get_request() return error pointers, fixing up issues
           where we NULL deref when a device goes bad or missing.  From Joe
         - Prep work for drastically reducing the memory consumption of dm
           devices from Junichi Nomura.  This allows creating clone bio sets
           without preallocating a lot of memory.
         - Fix a blk-mq hang on certain combinations of queue depths and
           hardware queues from me.
         - Limit memory consumption for blk-mq devices for crash dump
           scenarios and drivers that use crazy high depths (certain SCSI
           shared tag setups).  We now just use a single queue and limited
           depth for that"
      * 'for-3.18/core' of git://git.kernel.dk/linux-block: (58 commits)
        block: Remove REQ_KERNEL
        blk-mq: allocate cpumask on the home node
        bio-integrity: remove the needless fail handle of bip_slab creating
        block: include func name in __get_request prints
        block: make blk_update_request print prefix match ratelimited prefix
        blk-merge: don't compute bi_phys_segments from bi_vcnt for cloned bio
        block: fix alignment_offset math that assumes io_min is a power-of-2
        blk-mq: Make bt_clear_tag() easier to read
        blk-mq: fix potential hang if rolling wakeup depth is too high
        block: add bioset_create_nobvec()
        block: use bio_clone_fast() in blk_rq_prep_clone()
        block: misplaced rq_complete tracepoint
        sd: Honor block layer integrity handling flags
        block: Replace strnicmp with strncasecmp
        block: Add T10 Protection Information functions
        block: Don't merge requests if integrity flags differ
        block: Integrity checksum flag
        block: Relocate bio integrity flags
        block: Add a disk flag to block integrity profile
        block: Add prefix to block integrity profile flags
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd · 511c41d9
      Linus Torvalds authored
      Pull MTD update from Brian Norris:
       "Sorry for delaying this a bit later than usual.  There's one mild
        regression from 3.16 that was noticed during the 3.17 cycle, and I
        meant to send a fix for it along with this pull request.  I'll
        probably try to queue it up for a later pull request once I've had a
        better look at it, hopefully by -rc2 at the latest.
        Summary for this pull:
         - Cleanup for Denali driver
         - Atmel: add support for new page sizes
         - Atmel: fix up 'raw' mode support
         - Atmel: miscellaneous cleanups
         - New timing mode helpers for non-ONFI NAND
         - OMAP: allow driver to be (properly) built as a module
         - bcm47xx: RESET support and other cleanups
        SPI NOR
         - Miscellaneous cleanups, to prepare framework for wider use (some
           further work still pending)
         - Compile-time configuration to select 4K vs.  64K support for flash
           that support both (necessary for using UBIFS on some SPI NOR)
        A few scattered code quality fixes, detected by Coverity
        See the changesets for more"
      * tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd: (59 commits)
        mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message
        mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module
        mtd: move support for struct flash_platform_data into m25p80
        mtd: spi-nor: add Kconfig option to disable 4K sectors
        mtd: nand: Move ELM driver and rename as omap_elm
        nand: omap2: Replace pr_err with dev_err
        nand: omap2: Remove horrible ifdefs to fix module probe
        mtd: nand: add Hynix's H27UCG8T2ATR-BC to nand_ids table
        mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs
        mtd: physmap_of: Add non-obsolete map_rom probe
        mtd: physmap_of: Fix ROM support via OF
        MAINTAINERS: add l2-mtd.git, 'next' tree for MTD
        mtd: denali: fix indents and other trivial things
        mtd: denali: remove unnecessary parentheses
        mtd: denali: remove another set-but-unused variable
        mtd: denali: fix include guard and license block of denali.h
        mtd: nand: don't break long print messages
        mtd: bcm47xxnflash: replace some magic numbers
        mtd: bcm47xxnflash: NAND_CMD_RESET support
        mtd: bcm47xxnflash: add cmd_ctrl handler
    • Linus Torvalds's avatar
      Merge tag 'md/3.18' of git://neil.brown.name/md · 88ed806a
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       - a few minor bug fixes
       - quite a lot of code tidy-up and simplification
       - remove PRINT_RAID_DEBUG ioctl.  I'm fairly sure it is unused, and it
         isn't particularly useful.
      * tag 'md/3.18' of git://neil.brown.name/md: (21 commits)
        lib/raid6: Add log level to printks
        md: move EXPORT_SYMBOL to after function in md.c
        md: discard PRINT_RAID_DEBUG ioctl
        md: remove MD_BUG()
        md: clean up 'exit' labels in md_ioctl().
        md: remove unnecessary test for MD_MAJOR in md_ioctl()
        md: don't allow "-sync" to be set for device in an active array.
        md: remove unwanted white space from md.c
        md: don't start resync thread directly from md thread.
        md: Just use RCU when checking for overlap between arrays.
        md: avoid potential long delay under pers_lock
        md: simplify export_array()
        md: discard find_rdev_nr in favour of find_rdev_nr_rcu
        md: use wait_event() to simplify md_super_wait()
        md: be more relaxed about stopping an array which isn't started.
        md/raid1: process_checks doesn't use its return value.
        md/raid5: fix init_stripe() inconsistencies
        md/raid10: another memory leak due to reshape.
        md: use set_bit/clear_bit instead of shift/mask for bi_flags changes.
        md/raid1: minor typos and reformatting.
    • Linus Torvalds's avatar
      Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · e56d9fcc
      Linus Torvalds authored
      Pull selinux fix from James Morris:
       "Fix for a list corruption bug in the SELinux code"
      * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        selinux: fix inode security list corruption
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 0e6e58f9
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "One cc: stable commit, the rest are a series of minor cleanups which
        have been sitting in MST's tree during my vacation.  I changed a
        function name and made one trivial change, then they spent two days in
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
        virtio-rng: refactor probe error handling
        virtio_scsi: drop scan callback
        virtio_balloon: enable VQs early on restore
        virtio_scsi: fix race on device removal
        virito_scsi: use freezable WQ for events
        virtio_net: enable VQs early on restore
        virtio_console: enable VQs early on restore
        virtio_scsi: enable VQs early on restore
        virtio_blk: enable VQs early on restore
        virtio_scsi: move kick event out from virtscsi_init
        virtio_net: fix use after free on allocation failure
        9p/trans_virtio: enable VQs early
        virtio_console: enable VQs early
        virtio_blk: enable VQs early
        virtio_net: enable VQs early
        virtio: add API to enable VQs early
        virtio_net: minor cleanup
        virtio-net: drop config_mutex
        virtio_net: drop config_enable
        virtio-blk: drop config_mutex