Skip to content
  1. Jul 07, 2014
  2. Jul 06, 2014
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 110e4308
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "i915, tda998x and vmwgfx fixes,
      
        The main one is i915 fix for missing VGA connectors, along with some
        fixes for the tda998x from Russell fixing some modesetting problems.
      
        (still on holidays, but got a spare moment to find these)"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/vmwgfx: Fix incorrect write to read-only register v2:
        drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
        drm/i915: only apply crt_present check on VLV
        drm/i915: Wait for vblank after enabling the primary plane on BDW
        drm/i2c: tda998x: add some basic mode validation
        drm/i2c: tda998x: faster polling for edid
        drm/i2c: tda998x: move drm_i2c_encoder_destroy call
      110e4308
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 75bf757e
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "This week's arm-soc fixes:
      
         - A set of of OMAP patches that we had missed Tony's pull request of:
           * Reset fix for am43xx
           * Proper OPP table for omap5
           * Fix for SoC detection of one of the DRA7 SoCs
           * hwmod updates to get SATA and OCP to work on omap5 (drivers
             merged in 3.16)
           * ... plus a handful of smaller fixes
         - sunxi needed to re-add machine specific restart code that was
           removed in anticipation of a watchdog driver being merged for 3.16,
           and it didn't make it in.
         - Marvell fixes for PCIe on SMP and a big-endian fix.
         - A trivial defconfig update to make my capri test board boot with
           bcm_defconfig again.
      
        ... and a couple of MAINTAINERS updates, one to claim new Keystone
        drivers that have been merged, and one to merge MXS and i.MX (both
        Freescale platforms).
      
        The largest diffs come from the hwmod code for omap5 and the re-add of
        the restart code on sunxi.  The hwmod stuff is quite late at this
        point but it slipped through cracks repeatedly while coming up the
        maintainer chain and only affects the one SoC so risk is low"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: Add few more Keystone drivers
        MAINTAINERS: merge MXS entry into IMX one
        ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
        ARM: mvebu: fix cpuidle implementation to work on big-endian systems
        ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
        ARM: mvebu: move Armada 375 external abort logic as a quirk
        ARM: bcm: Fix bcm and multi_v7 defconfigs
        ARM: dts: dra7-evm: remove interrupt binding
        ARM: OMAP2+: Fix parser-bug in platform muxing code
        ARM: DTS: dra7/dra7xx-clocks: ATL related changes
        ARM: OMAP2+: drop unused function
        ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
        ARM: dts: omap5: Update CPU OPP table as per final production Manual
        ARM: DRA722: add detection of SoC information
        ARM: dts: Enable twl4030 off-idle configuration for selected omaps
        ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
        ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
      75bf757e
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 549f11c9
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "A few minor fixlets in ARM SoC irq drivers and a fix for a memory leak
        which I introduced in the last round of cleanups :("
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Fix memory leak when calling irq_free_hwirqs()
        irqchip: spear_shirq: Fix interrupt offset
        irqchip: brcmstb-l2: Level-2 interrupts are edge sensitive
        irqchip: armada-370-xp: Mask all interrupts during initialization.
      549f11c9
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel · dfd7aecf
      Dave Airlie authored
      Fixes for 3.16-rc3; most importantly Jesse brings back VGA he took away
      on a bunch of machines. Also a vblank fix for BDW and a power workaround
      fix for VLV.
      
      * tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
        drm/i915: only apply crt_present check on VLV
        drm/i915: Wait for vblank after enabling the primary plane on BDW
      dfd7aecf
    • Dave Airlie's avatar
      Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux · 80e6e6b1
      Dave Airlie authored
      fix to a 3.15 commit.
      
      * 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux:
        drm/vmwgfx: Fix incorrect write to read-only register v2:
      80e6e6b1
    • Dave Airlie's avatar
      Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox · d808e62f
      Dave Airlie authored
      mode fixes for tda998x.
      
      * 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
        drm/i2c: tda998x: add some basic mode validation
        drm/i2c: tda998x: faster polling for edid
        drm/i2c: tda998x: move drm_i2c_encoder_destroy call
      d808e62f
    • Keith Busch's avatar
      genirq: Fix memory leak when calling irq_free_hwirqs() · 8844aad8
      Keith Busch authored
      irq_free_hwirqs() always calls irq_free_descs() with a cnt == 0
      which makes it a no-op since the interrupt count to free is
      decremented in itself.
      
      Fixes: 7b6ef126
      
      
      
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Link: http://lkml.kernel.org/r/1404167084-8070-1-git-send-email-keith.busch@intel.com
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      8844aad8
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e1a08b85
      Linus Torvalds authored
      Pull ARM64 fixes from Catalin Marinas:
       - Exception level check at boot time (for completeness, not triggering
         any bug before)
       - I/D-cache synchronisation logic for huge pages
       - Config symbol typo
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: fix el2_setup check of CurrentEL
        arm64: mm: Make icache synchronisation logic huge page aware
        arm64: mm: Fix horrendous config typo
      e1a08b85
  3. Jul 05, 2014
    • Santosh Shilimkar's avatar
      MAINTAINERS: Add few more Keystone drivers · bc6aa566
      Santosh Shilimkar authored
      
      
      Update MAINTAINERS file for recently added reset controller, AEMIF
      and clocksource driver for Keystone SOCs.
      
      The EMIF memory controller driver is also added along with AEMIF.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Mike Turquette <mturquette@linaro.org>
      Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      bc6aa566
    • Shawn Guo's avatar
      MAINTAINERS: merge MXS entry into IMX one · ce515a6b
      Shawn Guo authored
      
      
      The mach-mxs platform is actually co-maintained by myself and
      pengutronix folks.  Also it's hosted in the same kernel tree as IMX.
      So let's merge the entry into IMX one.
      
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
      Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ce515a6b
    • Olof Johansson's avatar
      Merge tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu into fixes · 25d11631
      Olof Johansson authored
      
      
      mvebu fixes for v3.16 (round #2)
      
       - mvebu
          - Fix PCIe deadlock now that SMP is enabled
          - Fix cpuidle for big-endian systems
      
      * tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: fix cpuidle implementation to work on big-endian systems
        ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
        ARM: mvebu: move Armada 375 external abort logic as a quirk
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      25d11631
    • Maxime Ripard's avatar
      ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs · d767af5e
      Maxime Ripard authored
      This partly reverts commits 55360050 (ARM: sunxi: Remove reset code from
      the platform) and 5e669ec5
      
       (ARM: sunxi: Remove init_machine callback) for
      the sun4i, sun5i and sun7i families.
      
      This is needed because the watchdog counterpart of these commits was dropped,
      and didn't make it into 3.16. In order to still be able to reboot the board, we
      need to reintroduce that code. Of course, the long term view is still to get
      rid of that code in mach-sunxi.
      
      Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d767af5e
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of... · 5acd78c5
      Olof Johansson authored
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge OMAP fixes from Tony Lindgren:
      
      Fixes for omaps for issues discovered during the merge window and
      enabling of a few features that had to wait for the driver
      dependencies to clear.
      
      The fixes included are:
      
      - Fix am43xx hard reset flags
      - Fix SoC detection for DRA722
      - Fix CPU OPP table for omap5
      - Fix legacy mux parser bug if requested muxname is a prefix of
        multiple mux entries
      - Fix qspi interrupt binding that relies on the irq crossbar
        that has not yet been enabled
      - Add missing phy_sel for am43x-epos-evm
      - Drop unused gic_init_irq() that is no longer needed
      
      And the enabling of features that had driver dependencies are:
      
      - Change dra7 to use Audio Tracking Logic clock instead of a fixed
        clock now that the clock driver for it has been merged
      
      - Enable off idle configuration for selected omaps as all the kernel
        dependencies for device tree based booting are finally merged as
        this is needed to get the automated PM tests working finally with
        device tree based booting
      
      - Add hwmod entry for ocp2scp3 for omap5 to get sata working as
        all the driver dependencies are now in the kernel and this patch
        fell through the cracks during the merge window
      
      * tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: dra7-evm: remove interrupt binding
        ARM: OMAP2+: Fix parser-bug in platform muxing code
        ARM: DTS: dra7/dra7xx-clocks: ATL related changes
        ARM: OMAP2+: drop unused function
        ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
        ARM: dts: omap5: Update CPU OPP table as per final production Manual
        ARM: DRA722: add detection of SoC information
        ARM: dts: Enable twl4030 off-idle configuration for selected omaps
        ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
        ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
      5acd78c5
    • Linus Torvalds's avatar
      Merge tag 'md/3.16-fixes' of git://neil.brown.name/md · 77c4cf17
      Linus Torvalds authored
      Pull md bugfixes from Neil Brown:
       "Two minor bugfixes for md in 3.16"
      
      * tag 'md/3.16-fixes' of git://neil.brown.name/md:
        md: flush writes before starting a recovery.
        md: make sure GET_ARRAY_INFO ioctl reports correct "clean" status
      77c4cf17
  4. Jul 04, 2014
    • Linus Torvalds's avatar
      Merge tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 88b5a850
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This contains a few fixes for HD-audio: yet another Dell headset pin
        quirk, a fixup for Thinkpad T540P, and an improved fix for
        Haswell/Broadwell HDMI clock setup"
      
      * tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller
        drm/i915: provide interface for audio driver to query cdclk
        ALSA: hda - Add a fixup for Thinkpad T540p
        ALSA: hda - Add another headset pin quirk for some Dell machines
      88b5a850
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · b82207b8
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "We've queued up a few fixes in my for-linus branch"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix crash when starting transaction
        Btrfs: fix btrfs_print_leaf for skinny metadata
        Btrfs: fix race of using total_bytes_pinned
        btrfs: use E2BIG instead of EIO if compression does not help
        btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
        Btrfs: fix use-after-free when cloning a trailing file hole
        btrfs: fix null pointer dereference in btrfs_show_devname when name is null
        btrfs: fix null pointer dereference in clone_fs_devices when name is null
        btrfs: fix nossd and ssd_spread mount option regression
        Btrfs: fix race between balance recovery and root deletion
        Btrfs: atomically set inode->i_flags in btrfs_update_iflags
        btrfs: only unlock block in verify_parent_transid if we locked it
        Btrfs: assert send doesn't attempt to start transactions
        btrfs compression: reuse recently used workspace
        Btrfs: fix crash when mounting raid5 btrfs with missing disks
        btrfs: create sprout should rename fsid on the sysfs as well
        btrfs: dev replace should replace the sysfs entry
        btrfs: dev add should add its sysfs entry
        btrfs: dev delete should remove sysfs entry
        btrfs: rename add_device_membership to btrfs_kobj_add_device
      b82207b8
    • Marc Zyngier's avatar
      arm64: fix el2_setup check of CurrentEL · 974c8e45
      Marc Zyngier authored
      
      
      The CurrentEL system register reports the Current Exception Level
      of the CPU. It doesn't say anything about the stack handling, and
      yet we compare it to PSR_MODE_EL2t and PSR_MODE_EL2h.
      
      It works by chance because PSR_MODE_EL2t happens to match the right
      bits, but that's otherwise a very bad idea. Just check for the EL
      value instead.
      
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      [catalin.marinas@arm.com: fixed arch/arm64/kernel/efi-entry.S]
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      974c8e45
    • Steve Capper's avatar
      arm64: mm: Make icache synchronisation logic huge page aware · 923b8f50
      Steve Capper authored
      
      
      The __sync_icache_dcache routine will only flush the dcache for the
      first page of a compound page, potentially leading to stale icache
      data residing further on in a hugetlb page.
      
      This patch addresses this issue by taking into consideration the
      order of the page when flushing the dcache.
      
      Reported-by: default avatarMark Brown <broonie@linaro.org>
      Tested-by: default avatarMark Brown <broonie@linaro.org>
      Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Cc: <stable@vger.kernel.org> # v3.11+
      923b8f50
    • Steve Capper's avatar
      arm64: mm: Fix horrendous config typo · f3b766a2
      Steve Capper authored
      
      
      The define ARM64_64K_PAGES is tested for rather than
      CONFIG_ARM64_64K_PAGES. Correct that typo here.
      
      Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      f3b766a2
    • Chris Wilson's avatar
      drm/i915: Show cursor size in debugfs/i915_display_info · 57127efa
      Chris Wilson authored
      
      
      Inlcude the pipe-size and cursor-size in debugfs.
      
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      57127efa
    • Mengdong Lin's avatar
      ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller · e4d9e513
      Mengdong Lin authored
      
      
      For HSW/BDW display HD-A controller, hda_set_bclk() is defined to set BCLK
      by programming the M/N values as per the core display clock (CDCLK) queried from
      i915 display driver.
      
      And the audio driver will also set BCLK in azx_first_init() since the display
      driver can turn off the shared power in boot phase if only eDP is connected
      and M/N values will be lost and must be reprogrammed.
      
      Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      e4d9e513
    • Jani Nikula's avatar
      drm/i915: provide interface for audio driver to query cdclk · c149dcb5
      Jani Nikula authored
      
      
      For Haswell and Broadwell, if the display power well has been disabled,
      the display audio controller divider values EM4 M VALUE and EM5 N VALUE
      will have been lost. The CDCLK frequency is required for reprogramming them
      to generate 24MHz HD-A link BCLK. So provide a private interface for the
      audio driver to query CDCLK.
      
      This is a stopgap solution until a more generic interface between audio
      and display drivers has been implemented.
      
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
      Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      c149dcb5
    • Linus Torvalds's avatar
      Merge tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 034a0f6b
      Linus Torvalds authored
      Pull USB bugfixes from Greg KH:
       "Here's a round of USB bugfixes, quirk additions, and new device ids
        for 3.16-rc4.  Nothing major in here at all, just a bunch of tiny
        changes.  All have been in linux-next with no reported issues"
      
      * tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
        usb: chipidea: udc: delete td from req's td list at ep_dequeue
        usb: Kconfig: make EHCI_MSM selectable for QCOM SOCs
        usb-storage/SCSI: Add broken_fua blacklist flag
        usb: musb: dsps: fix the base address for accessing the mode register
        tools: ffs-test: fix header values endianess
        usb: phy: msm: Do not do runtime pm if the phy is not idle
        usb: musb: Ensure that cppi41 timer gets armed on premature DMA TX irq
        usb: gadget: gr_udc: Fix check for invalid number of microframes
        usb: musb: Fix panic upon musb_am335x module removal
        usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
        Revert "tools: ffs-test: convert to new descriptor format fixing compilation error"
        xhci: Fix runtime suspended xhci from blocking system suspend.
        xhci: clear root port wake on bits if controller isn't wake-up capable
        xhci: correct burst count field for isoc transfers on 1.0 xhci hosts
        xhci: Use correct SLOT ID when handling a reset device command
        MAINTAINERS: update e-mail address
        usb: option: add/modify Olivetti Olicard modems
        USB: ftdi_sio: fix null deref at port probe
        MAINTAINERS: drop two usb-serial subdriver entries
        USB: option: add device ID for SpeedUp SU9800 usb 3g modem
        ...
      034a0f6b
    • Linus Torvalds's avatar
      Merge tag 'staging-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 9911f2e1
      Linus Torvalds authored
      Pull staging driver bugfixes from Greg KH:
       "Nothing major here, just 4 small bugfixes that resolve some issues
        reported for the IIO (staging and non-staging) and the tidspbridge
        driver"
      
      * tag 'staging-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: tidspbridge: fix an erroneous removal of parentheses
        iio: of_iio_channel_get_by_name() returns non-null pointers for error legs
        staging: iio/ad7291: fix error code in ad7291_probe()
        iio:adc:ad799x: Fix reading and writing of event values, apply shift
      9911f2e1
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.16-rc4' of... · 3089f54a
      Linus Torvalds authored
      Merge tag 'driver-core-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg KH:
       "Well, one drivercore fix for kernfs to resolve a reported issue with
        sysfs files being updated from atomic contexts, and another lz4 bugfix
        for testing potential buffer overflows"
      
      * tag 'driver-core-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        lz4: add overrun checks to lz4_uncompress_unknownoutputsize()
        kernfs: kernfs_notify() must be useable from non-sleepable contexts
      3089f54a
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.16-rc3' of... · ef34c6ce
      Linus Torvalds authored
      Merge tag 'trace-fixes-v3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Oleg Nesterov found and fixed a bug in the perf/ftrace/uprobes code
        where running:
      
          # perf probe -x /lib/libc.so.6 syscall
          # echo 1 >> /sys/kernel/debug/tracing/events/probe_libc/enable
          # perf record -e probe_libc:syscall whatever
      
        kills the uprobe.  Along the way he found some other minor bugs and
        clean ups that he fixed up making it a total of 4 patches.
      
        Doing unrelated work, I found that the reading of the ftrace trace
        file disables all function tracer callbacks.  This was fine when
        ftrace was the only user, but now that it's used by perf and kprobes,
        this is a bug where reading trace can disable kprobes and perf.  A
        very unexpected side effect and should be fixed"
      
      * tag 'trace-fixes-v3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Remove ftrace_stop/start() from reading the trace file
        tracing/uprobes: Fix the usage of uprobe_buffer_enable() in probe_event_enable()
        tracing/uprobes: Kill the bogus UPROBE_HANDLER_REMOVE code in uprobe_dispatcher()
        uprobes: Change unregister/apply to WARN() if uprobe/consumer is gone
        tracing/uprobes: Revert "Support mix of ftrace and perf"
      ef34c6ce
    • Linus Torvalds's avatar
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · af6f157a
      Linus Torvalds authored
      Pull kbuild fix from Michal Marek:
       "There is one more fix for the relative paths series from -rc1: Print
        the path to the build directory at the start of the build, so that
        editors and IDEs can match the relative paths to source files"
      
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: Print the name of the build directory
      af6f157a