1. 04 5月, 2015 6 次提交
  2. 02 5月, 2015 6 次提交
  3. 01 5月, 2015 22 次提交
    • L
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 64887b68
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "A few more btrfs fixes.
      
        These range from corners Filipe found in the new free space cache
        writeback to a grab bag of fixes from the list"
      
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: btrfs_release_extent_buffer_page didn't free pages of dummy extent
        Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode.
        btrfs: unlock i_mutex after attempting to delete subvolume during send
        btrfs: check io_ctl_prepare_pages return in __btrfs_write_out_cache
        btrfs: fix race on ENOMEM in alloc_extent_buffer
        btrfs: handle ENOMEM in btrfs_alloc_tree_block
        Btrfs: fix find_free_dev_extent() malfunction in case device tree has hole
        Btrfs: don't check for delalloc_bytes in cache_save_setup
        Btrfs: fix deadlock when starting writeback of bg caches
        Btrfs: fix race between start dirty bg cache writeout and bg deletion
      64887b68
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 036f351e
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
       "Not too much here, but we've addressed a couple of nasty issues in the
        dma-mapping code as well as adding the halfword and byte variants of
        load_acquire/store_release following on from the CSD locking bug that
        you fixed in the core.
      
         - fix perf devicetree warnings at probe time
      
         - fix memory leak in __dma_free()
      
         - ensure DMA buffers are always zeroed
      
         - show IRQ trigger in /proc/interrupts (for parity with ARM)
      
         - implement byte and halfword access for smp_{load_acquire,store_release}"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: perf: Fix the pmu node name in warning message
        arm64: perf: don't warn about missing interrupt-affinity property for PPIs
        arm64: add missing PAGE_ALIGN() to __dma_free()
        arm64: dma-mapping: always clear allocated buffers
        ARM64: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL
        arm64: add missing data types in smp_load_acquire/smp_store_release
      036f351e
    • S
      powerpc/powernv: Restore non-volatile CRs after nap · 0aab3747
      Sam Bobroff 提交于
      Patches 7cba160a "powernv/cpuidle: Redesign idle states management"
      and 77b54e9f "powernv/powerpc: Add winkle support for offline cpus"
      use non-volatile condition registers (cr2, cr3 and cr4) early in the system
      reset interrupt handler (system_reset_pSeries()) before it has been determined
      if state loss has occurred. If state loss has not occurred, control returns via
      the power7_wakeup_noloss() path which does not restore those condition
      registers, leaving them corrupted.
      
      Fix this by restoring the condition registers in the power7_wakeup_noloss()
      case.
      
      This is apparent when running a KVM guest on hardware that does not
      support winkle or sleep and the guest makes use of secondary threads. In
      practice this means Power7 machines, though some early unreleased Power8
      machines may also be susceptible.
      
      The secondary CPUs are taken off line before the guest is started and
      they call pnv_smp_cpu_kill_self(). This checks support for sleep
      states (in this case there is no support) and power7_nap() is called.
      
      When the CPU is woken, power7_nap() returns and because the CPU is
      still off line, the main while loop executes again. The sleep states
      support test is executed again, but because the tested values cannot
      have changed, the compiler has optimized the test away and instead we
      rely on the result of the first test, which has been left in cr3
      and/or cr4. With the result overwritten, the wrong branch is taken and
      power7_winkle() is called on a CPU that does not support it, leading
      to it stalling.
      
      Fixes: 7cba160a ("powernv/cpuidle: Redesign idle states management")
      Fixes: 77b54e9f ("powernv/powerpc: Add winkle support for offline cpus")
      [mpe: Massage change log a bit more]
      Signed-off-by: NSam Bobroff <sam.bobroff@au1.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      0aab3747
    • G
      powerpc/eeh: Delay probing EEH device during hotplug · d91dafc0
      Gavin Shan 提交于
      Commit 1c509148b ("powerpc/eeh: Do probe on pci_dn") probes EEH
      devices in early stage, which is reasonable to pSeries platform.
      However, it's wrong for PowerNV platform because the PE# isn't
      determined until the resources (IO and MMIO) are assigned to
      PE in hotplug case. So we have to delay probing EEH devices
      for PowerNV platform until the PE# is assigned.
      
      Fixes: ff57b454 ("powerpc/eeh: Do probe on pci_dn")
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      d91dafc0
    • G
      powerpc/eeh: Fix race condition in pcibios_set_pcie_reset_state() · 1ae79b78
      Gavin Shan 提交于
      When asserting reset in pcibios_set_pcie_reset_state(), the PE
      is enforced to (hardware) frozen state in order to drop unexpected
      PCI transactions (except PCI config read/write) automatically by
      hardware during reset, which would cause recursive EEH error.
      However, the (software) frozen state EEH_PE_ISOLATED is missed.
      When users get 0xFF from PCI config or MMIO read, EEH_PE_ISOLATED
      is set in PE state retrival backend. Unfortunately, nobody (the
      reset handler or the EEH recovery functinality in host) will clear
      EEH_PE_ISOLATED when the PE has been passed through to guest.
      
      The patch sets and clears EEH_PE_ISOLATED properly during reset
      in function pcibios_set_pcie_reset_state() to fix the issue.
      
      Fixes: 28158cd1 ("Enhance pcibios_set_pcie_reset_state()")
      Reported-by: NCarol L. Soto <clsoto@us.ibm.com>
      Signed-off-by: NGavin Shan <gwshan@linux.vnet.ibm.com>
      Tested-by: NCarol L. Soto <clsoto@us.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      1ae79b78
    • N
      powerpc/pseries: Correct cpu affinity for dlpar added cpus · f32393c9
      Nathan Fontenot 提交于
      The incorrect ordering of operations during cpu dlpar add results in invalid
      affinity for the cpu being added. The ibm,associativity property in the
      device tree is populated with all zeroes for the added cpu which results in
      invalid affinity mappings and all cpus appear to belong to node 0.
      
      This occurs because rtas configure-connector is called prior to making the
      rtas set-indicator calls. Phyp does not assign affinity information
      for a cpu until the rtas set-indicator calls are made to set the isolation
      and allocation state.
      
      Correct the order of operations to make the rtas set-indicator
      calls (done in dlpar_acquire_drc) before calling rtas configure-connector.
      
      Fixes: 1a8061c4 ("powerpc/pseries: Add kernel based CPU DLPAR handling")
      Signed-off-by: NNathan Fontenot <nfont@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      f32393c9
    • M
      selftests/powerpc: Fix the pmu install rule · 2fa30fe9
      Michael Ellerman 提交于
      My patch to add install support for the powerpc selftests had a typo,
      leading to the three tests in the pmu directory itself not being
      installed.
      
      Fixes: 6faeeea4 ("selftests: Add install support for the powerpc tests")
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      2fa30fe9
    • L
      Merge tag 'pm+acpi-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 4a152c39
      Linus Torvalds 提交于
      Pull power management and ACPI fixes from Rafael Wysocki:
       "Three regression fixes this time, one for a recent regression in the
        cpuidle core affecting multiple systems, one for an inadvertently
        added duplicate typedef in ACPICA that breaks compilation with GCC 4.5
        and one for an ACPI Smart Battery Subsystem driver regression
        introduced during the 3.18 cycle (stable-candidate).
      
        Specifics:
      
         - Fix for a regression in the cpuidle core introduced by one of the
           recent commits in the clockevents_notify() removal series that put
           a call to a function which had to be executed with disabled
           interrupts into a code path running with enabled interrupts (Rafael
           J Wysocki)
      
         - Fix for a build problem in ACPICA (with GCC 4.5) introduced by one
           of the recent ACPICA tools commits that added a duplicate typedef
           to one of the ACPICA's header files by mistake (Olaf Hering)
      
         - Fix for a regression in the ACPI SBS (Smart Battery Subsystem)
           driver introduced during the 3.18 development cycle causing the
           smart battery manager to be marked as not present when it should be
           marked as present (Chris Bainbridge)"
      
      * tag 'pm+acpi-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: Run tick_broadcast_exit() with disabled interrupts
        ACPI / SBS: Enable battery manager when present
        ACPICA: remove duplicate u8 typedef
      4a152c39
    • L
      Merge tag 'sound-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5a2e73b2
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "One nice fix is Peter's patch to make the old good SB Audigy PCI to
        work with 32bit DMA instead of 31bit.  This allows the MIDI synth
        running on modern machines again.  Along with it, a few fixes for
        emu10k1 have merged.
      
        In ASoC side, there is one fix in the common code, but it's just
        trivial additions of static inline functions for CONFIG_PM=n.  The
        rest are various device-specific small fixes.
      
        Last but not least, a few HD-audio fixes are included, as usual, too"
      
      * tag 'sound-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
        ASoC: rt5677: fixed wrong DMIC ref clock
        ALSA: emu10k1: Emu10k2 32 bit DMA mode
        ALSA: emux: Fix mutex deadlock in OSS emulation
        ASoC: Update email-id of Rajeev Kumar
        ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
        ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()
        ALSA: emux: Fix mutex deadlock at unloading
        ALSA: emu10k1: Fix card shortname string buffer overflow
        ALSA: hda - Add mute-LED mode control to Thinkpad
        ALSA: hda - Fix mute-LED fixed mode
        ALSA: hda - Fix click noise at start on Dell XPS13
        ASoC: rt5645: Add ACPI match ID
        ASoC: rt5677: add register patch for PLL
        ASoC: Intel: fix the makefile for atom code
        ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE
        ASoC: add static inline funcs to fix a compiling issue
        ASoC: Intel: sst_byt: remove kfree for memory allocated with devm_kzalloc
        ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()
        ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe()
        ASoC: fsl_ssi: Fix platform_get_irq() error handling
        ...
      5a2e73b2
    • M
      net: fec: Fix RGMII-ID mode · e813bb2b
      Markus Pargmann 提交于
      RGMII-ID uses an internal delay within the transmitter or receiver. This
      feature is phy specific. The rest of the communication is normal RGMII.
      
      So the fec driver has to check for all RGMII modes, not only
      'PHY_INTERFACE_MODE_RGMII'.
      Signed-off-by: NMarkus Pargmann <mpa@pengutronix.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e813bb2b
    • I
      net/mlx4_en: Schedule napi when RX buffers allocation fails · 07841f9d
      Ido Shamay 提交于
      When system is out of memory, refilling of RX buffers fails while
      the driver continue to pass the received packets to the kernel stack.
      At some point, when all RX buffers deplete, driver may fall into a
      sleep, and not recover when memory for new RX buffers is once again
      availible. This is because hardware does not have valid descriptors,
      so no interrupt will be generated for the driver to return to work
      in napi context. Fix it by schedule the napi poll function from
      stats_task delayed workqueue, as long as the allocations fail.
      Signed-off-by: NIdo Shamay <idos@mellanox.com>
      Signed-off-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      07841f9d
    • T
      netxen_nic: use spin_[un]lock_bh around tx_clean_lock · c232d8a8
      Tony Camuso 提交于
      While testing this driver with DEBUG_LOCKDEP and DEBUG_SPINLOCK
      enabled did not produce any traces, it would be more prudent in the
      case of tx_clean_lock to use spin_[un]lock_bh, since this lock is
      manipulated in both the process and softirq contexts.
      
      This patch was tested for functionality and regressions with netperf
      and DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled.
      Signed-off-by: NTony Camuso <tcamuso@redhat.com>
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c232d8a8
    • D
      net/mlx4_core: Fix unaligned accesses · 17d5ceb6
      David Ahern 提交于
      Addresses the following kernel logs seen during boot:
      
      Kernel unaligned access at TPC[100ee150] mlx4_QUERY_HCA+0x80/0x248 [mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c [mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c [mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c [mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c [mlx4_core]
      Signed-off-by: NDavid Ahern <david.ahern@oracle.com>
      Acked-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      17d5ceb6
    • B
      mlx4_en: Use correct loop cursor in error path. · f94813f3
      Benjamin Poirier 提交于
      Signed-off-by: NBenjamin Poirier <bpoirier@suse.de>
      Fixes: 9e311e77 ("net/mlx4_en: Use affinity hint")
      Acked-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f94813f3
    • R
      50904a7d
    • T
      Merge tag 'asoc-v4.1-rc1' of... · 0ae3aba2
      Takashi Iwai 提交于
      Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v4.1
      
      A few fixes for v4.1, none earth shattering and mostly driver related
      except for one change to fix !PM builds for Intel platforms which is
      done by adding stubs in the core so other platforms don't run into the
      same issue.
      0ae3aba2
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 9dbbe3cf
      Linus Torvalds 提交于
      Pull kvm changes from Paolo Bonzini:
       "Remove from guest code the handling of task migration during a pvclock
        read; instead use the correct protocol in KVM.
      
        This removes the need for task migration notifiers in core scheduler
        code"
      
      [ The scheduler people really hated the migration notifiers, so this was
        kind of required  - Linus ]
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86: pvclock: Really remove the sched notifier for cross-cpu migrations
        kvm: x86: fix kvmclock update protocol
      9dbbe3cf
    • L
      Merge tag 'dm-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · fb45f493
      Linus Torvalds 提交于
      Pull device mapper bugfixes from Mike Snitzer:
       "Fix two bugs in the request-based DM blk-mq support that was added
        during the 4.1 merge"
      
      * tag 'dm-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: fix free_rq_clone() NULL pointer when requeueing unmapped request
        dm: only initialize the request_queue once
      fb45f493
    • D
      modsign: change default key details · 9c4249c8
      David Howells 提交于
      Change default key details to be more obviously unspecified.
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NJames Morris <james.l.morris@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9c4249c8
    • L
      Merge tag 'tty-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 9263a06a
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg KH:
       "Here are some small tty/serial driver fixes for 4.1-rc2.
      
        They include some minor fixes that resolve reported issues, and a new
        device quirk.
      
        All have been in linux-next succesfully"
      
      * tag 'tty-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: 8250_pci: Add support for 16 port Exar boards
        serial: samsung: fix serial console break
        tty/serial: at91: maxburst was missing for dma transfers
        serial: of-serial: Remove device_type = "serial" registration
        serial: xilinx: Use platform_get_irq to get irq description structure
        serial: core: Fix kernel-doc build warnings
        tty: Re-add external interface for tty_set_termios()
      9263a06a
    • L
      Merge tag 'usb-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · dcca8de0
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are a number of small USB fixes for 4.2-rc2.  They revert one
        problem patch, fix some minor things, and add some new quirks for
        "broken" devices.
      
        All have been in linux-next successfully"
      
      * tag 'usb-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        cdc-acm: prevent infinite loop when parsing CDC headers.
        Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"
        usb: chipidea: otg: remove mutex unlock and lock while stop and start role
        uas: Set max_sectors_240 quirk for ASM1053 devices
        uas: Add US_FL_MAX_SECTORS_240 flag
        uas: Allow uas_use_uas_driver to return usb-storage flags
      dcca8de0
    • L
      Merge tag 'renesas-sh-drivers-for-v4.1' of... · 73be174c
      Linus Torvalds 提交于
      Merge tag 'renesas-sh-drivers-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      Pull SH driver updates from Simon Horman:
      
       - remove test for now unsupported sh7372 SoC
      
       - disable PM runtime for multi-platform r8a73a4 and sh73a0 SoCs with
         genpd
      
      * tag 'renesas-sh-drivers-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: Remove test for now unsupported sh7372
        drivers: sh: Disable PM runtime for multi-platform r8a73a4 with genpd
        drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd
      73be174c
  4. 30 4月, 2015 6 次提交
    • M
      dm: fix free_rq_clone() NULL pointer when requeueing unmapped request · aa6df8dd
      Mike Snitzer 提交于
      Commit 02233342 ("dm: optimize dm_mq_queue_rq to _not_ use kthread if
      using pure blk-mq") mistakenly removed free_rq_clone()'s clone->q check
      before testing clone->q->mq_ops.  It was an oversight to discontinue
      that check for 1 of the 2 use-cases for free_rq_clone():
      1) free_rq_clone() called when an unmapped original request is requeued
      2) free_rq_clone() called in the request-based IO completion path
      
      The clone->q check made sense for case #1 but not for #2.  However, we
      cannot just reinstate the check as it'd mask a serious bug in the IO
      completion case #2 -- no in-flight request should have an uninitialized
      request_queue (basic block layer refcounting _should_ ensure this).
      
      The NULL pointer seen for case #1 is detailed here:
      https://www.redhat.com/archives/dm-devel/2015-April/msg00160.html
      
      Fix this free_rq_clone() NULL pointer by simply checking if the
      mapped_device's type is DM_TYPE_MQ_REQUEST_BASED (clone's queue is
      blk-mq) rather than checking clone->q->mq_ops.  This avoids the need to
      dereference clone->q, but a WARN_ON_ONCE is added to let us know if an
      uninitialized clone request is being completed.
      Reported-by: NBart Van Assche <bart.vanassche@sandisk.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      aa6df8dd
    • C
      dm: only initialize the request_queue once · 3e6180f0
      Christoph Hellwig 提交于
      Commit bfebd1cd ("dm: add full blk-mq support to request-based DM")
      didn't properly account for the need to short-circuit re-initializing
      DM's blk-mq request_queue if it was already initialized.
      
      Otherwise, reloading a blk-mq request-based DM table (either manually
      or via multipathd) resulted in errors, see:
       https://www.redhat.com/archives/dm-devel/2015-April/msg00132.html
      
      Fix is to only initialize the request_queue on the initial table load
      (when the mapped_device type is assigned).
      
      This is better than having dm_init_request_based_blk_mq_queue() return
      early if the queue was already initialized because it elevates the
      constraint to a more meaningful location in DM core.  As such the
      pre-existing early return in dm_init_request_based_queue() can now be
      removed.
      
      Fixes: bfebd1cd ("dm: add full blk-mq support to request-based DM")
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      3e6180f0
    • S
      arm64: perf: Fix the pmu node name in warning message · 8291fd04
      Suzuki K. Poulose 提交于
      With commit d5efd9cc ("arm64: pmu: add support for interrupt-affinity
      property"), we print a warning when we find a PMU SPI with a missing
      missing interrupt-affinity property in a pmu node. Unfortunately, we
      pass the wrong (NULL) device node to of_node_full_name, resulting in
      unhelpful messages such as:
      
       hw perfevents: Failed to parse <no-node>/interrupt-affinity[0]
      
      This patch fixes the name to that of the pmu node.
      
      Fixes: d5efd9cc (arm64: pmu: add support for interrupt-affinity property)
      Acked-by: NMark Rutland <mark.rutland@arm.com>
      Signed-off-by: NSuzuki K. Poulose <suzuki.poulose@arm.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      8291fd04
    • W
      arm64: perf: don't warn about missing interrupt-affinity property for PPIs · d795ef9a
      Will Deacon 提交于
      PPIs are affine by nature, so the interrupt-affinity property is not
      used and therefore we shouldn't print a warning in its absence.
      Reported-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
      Reviewed-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      d795ef9a
    • M
      Revert "powerpc/tm: Abort syscalls in active transactions" · 68fc378c
      Michael Ellerman 提交于
      This reverts commit feba4036.
      
      Although the principle of this change is good, the implementation has a
      few issues.
      
      Firstly we can sometimes fail to abort a syscall because r12 may have
      been clobbered by C code if we went down the virtual CPU accounting
      path, or if syscall tracing was enabled.
      
      Secondly we have decided that it is safer to abort the syscall even
      earlier in the syscall entry path, so that we avoid the syscall tracing
      path when we are transactional.
      
      So that we have time to thoroughly test those changes we have decided to
      revert this for this merge window and will merge the fixed version in
      the next window.
      
      NB. Rather than reverting the selftest we just drop tm-syscall from
      TEST_PROGS so that it's not run by default.
      
      Fixes: feba4036 ("powerpc/tm: Abort syscalls in active transactions")
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      68fc378c
    • D
      Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · feb589e9
      Dave Airlie 提交于
      Fixes for 4.1 for radeon all destined for stable:
      - fix fallout from the audio rework
      - VM fixes
      - other assorted bug fixes
      
      * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: fix userptr return value checking (v2)
        drm/radeon: check new address before removing old one
        drm/radeon: reset BOs address after clearing it.
        drm/radeon: fix lockup when BOs aren't part of the VM on release
        drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5
        drm/radeon: adjust pll when audio is not enabled
        drm/radeon: only enable audio streams if the monitor supports it
        drm/radeon: only mark audio as connected if the monitor supports it (v3)
        drm/radeon/audio: don't enable packets until the end
        drm/radeon: drop dce6_dp_enable
        drm/radeon: fix ordering of AVI packet setup
        drm/radeon: Use drm_calloc_ab for CS relocs
      feb589e9