1. 09 7月, 2014 1 次提交
  2. 08 7月, 2014 2 次提交
  3. 07 7月, 2014 3 次提交
    • L
      Linux 3.16-rc4 · cd3de83f
      Linus Torvalds 提交于
      cd3de83f
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 100193f5
      Linus Torvalds 提交于
      Pull devicetree bugfix from Grant Likely:
       "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
        Without this patch the kernel will try to use memory ranges that
        cannot be reached"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch
      100193f5
    • L
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 8addf0c7
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of 13 fixes, a MAINTAINERS update and a sparse update.
        The fixes are mostly correct value initialisations, avoiding NULL
        derefs and some uninitialised pointer avoidance.
      
        All the patches have been incubated in -next for a few days.  The
        final patch (use the scsi data buffer length to extract transfer size)
        has been rebased to add a cc to stable, but only the commit message
        has changed"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] use the scsi data buffer length to extract transfer size
        virtio-scsi: fix various bad behavior on aborted requests
        virtio-scsi: avoid cancelling uninitialized work items
        ibmvscsi: Add memory barriers for send / receive
        ibmvscsi: Abort init sequence during error recovery
        qla2xxx: Fix sparse warning in qla_target.c.
        bnx2fc: Improve stats update mechanism
        bnx2fc: do not scan uninitialized lists in case of error.
        fc: ensure scan_work isn't active when freeing fc_rport
        pm8001: Fix potential null pointer dereference and memory leak.
        MAINTAINERS: Update LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) maintainers Email IDs
        be2iscsi: remove potential junk pointer free
        be2iscsi: add an missing goto in error path
        scsi_error: set DID_TIME_OUT correctly
        scsi_error: fix invalid setting of host byte
      8addf0c7
  4. 06 7月, 2014 8 次提交
  5. 05 7月, 2014 7 次提交
  6. 04 7月, 2014 19 次提交
    • L
      Merge tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 88b5a850
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · b82207b8
      Linus Torvalds 提交于
      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
    • M
      arm64: fix el2_setup check of CurrentEL · 974c8e45
      Marc Zyngier 提交于
      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: NMarc Zyngier <marc.zyngier@arm.com>
      [catalin.marinas@arm.com: fixed arch/arm64/kernel/efi-entry.S]
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      974c8e45
    • S
      arm64: mm: Make icache synchronisation logic huge page aware · 923b8f50
      Steve Capper 提交于
      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: NMark Brown <broonie@linaro.org>
      Tested-by: NMark Brown <broonie@linaro.org>
      Signed-off-by: NSteve Capper <steve.capper@linaro.org>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      Cc: <stable@vger.kernel.org> # v3.11+
      923b8f50
    • S
      arm64: mm: Fix horrendous config typo · f3b766a2
      Steve Capper 提交于
      The define ARM64_64K_PAGES is tested for rather than
      CONFIG_ARM64_64K_PAGES. Correct that typo here.
      Signed-off-by: NSteve Capper <steve.capper@linaro.org>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      f3b766a2
    • M
      ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller · e4d9e513
      Mengdong Lin 提交于
      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: NMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      e4d9e513
    • J
      drm/i915: provide interface for audio driver to query cdclk · c149dcb5
      Jani Nikula 提交于
      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: NJani Nikula <jani.nikula@intel.com>
      Reviewed-by: NDamien Lespiau <damien.lespiau@intel.com>
      Signed-off-by: NMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      c149dcb5
    • L
      Merge tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 034a0f6b
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'staging-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 9911f2e1
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'driver-core-3.16-rc4' of... · 3089f54a
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'trace-fixes-v3.16-rc3' of... · ef34c6ce
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · af6f157a
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux · 0fba687f
      Linus Torvalds 提交于
      Pull nfsd bugfixes from Bruce Fields:
       "By coincidence, two NFSv4 symlink bugs, one introduced in the 3.16 xdr
        encoding rewrite, the other a decoding bug that I think we've had
        since the start but that just doesn't trigger very often"
      
      * 'for-3.16' of git://linux-nfs.org/~bfields/linux:
        nfs: fix nfs4d readlink truncated packet
        nfsd: fix rare symlink decoding bug
      0fba687f
    • T
      ptrace,x86: force IRET path after a ptrace_stop() · b9cd18de
      Tejun Heo 提交于
      The 'sysret' fastpath does not correctly restore even all regular
      registers, much less any segment registers or reflags values.  That is
      very much part of why it's faster than 'iret'.
      
      Normally that isn't a problem, because the normal ptrace() interface
      catches the process using the signal handler infrastructure, which
      always returns with an iret.
      
      However, some paths can get caught using ptrace_event() instead of the
      signal path, and for those we need to make sure that we aren't going to
      return to user space using 'sysret'.  Otherwise the modifications that
      may have been done to the register set by the tracer wouldn't
      necessarily take effect.
      
      Fix it by forcing IRET path by setting TIF_NOTIFY_RESUME from
      arch_ptrace_stop_needed() which is invoked from ptrace_stop().
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-by: NAndy Lutomirski <luto@amacapital.net>
      Acked-by: NOleg Nesterov <oleg@redhat.com>
      Suggested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b9cd18de
    • G
      lz4: add overrun checks to lz4_uncompress_unknownoutputsize() · 4a3a9904
      Greg Kroah-Hartman 提交于
      Jan points out that I forgot to make the needed fixes to the
      lz4_uncompress_unknownoutputsize() function to mirror the changes done
      in lz4_decompress() with regards to potential pointer overflows.
      
      The only in-kernel user of this function is the zram code, which only
      takes data from a valid compressed buffer that it made itself, so it's
      not a big issue.  But due to external kernel modules using this
      function, it's better to be safe here.
      Reported-by: NJan Beulich <JBeulich@suse.com>
      Cc: "Don A. Bailey" <donb@securitymouse.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      4a3a9904
    • G
      Merge branch 'component-for-driver' of... · 868b60e0
      Greg Kroah-Hartman 提交于
      Merge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into driver-core-next
      
      Russell writes:
      
      These updates fix one bug in the component helper where the matched
      components are not properly cleaned up when the master fails to bind.
      I'll provide a version of this for stable trees if it's deemed that
      we need to backport it.
      
      The second patch causes the component helper to ignore duplicate
      matches when adding components - this is something that was originally
      needed for imx-drm, but since that has now been updated, we no longer
      need to skip over a component which has already been matched.
      
      The final patch starts the process of updating the component helper
      API to achieve two goals: to allow the API to be more efficient when
      deferred probing occurs, and to allow for future improvements to the
      component helper without having a major impact on the users.
      
      This represents groundwork for some other changes; once this has been
      merged, I will then send two further pull requests (one for the staging
      tree, and one for the DRM tree) to update the drivers to the new API.
      This will result in these three commits being shared with those trees.
      868b60e0
    • J
    • M
      [SCSI] use the scsi data buffer length to extract transfer size · 5616b0a4
      Martin K. Petersen 提交于
      Commit 8846bab1 introduced a helper that can be used to query the
      wire transfer size for a SCSI command taking protection information into
      account.
      
      However, some commands do not have a 1:1 mapping between the block range
      they work on and the payload size (discard, write same). After the
      scatterlist has been set up these requests use __data_len to store the
      number of bytes to report completion on. This means that callers of
      scsi_transfer_length() would get the wrong byte count for these types of
      requests.
      
      To overcome this we make scsi_transfer_length() use the scatterlist
      length in the scsi_data_buffer as basis for the wire transfer
      calculation instead of __data_len.
      Reported-by: NChristoph Hellwig <hch@infradead.org>
      Debugged-by: NMike Christie <michaelc@cs.wisc.edu>
      Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reviewed-by: NSagi Grimberg <sagig@mellanox.com>
      Fixes: d77e6535
      Cc: stable@vger.kernel.org
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      5616b0a4
    • L
      Merge branch 'akpm' (patches from Andrew Morton) · 5170a3b2
      Linus Torvalds 提交于
      Merge fixes from Andrew Morton:
       "14 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        shmem: fix init_page_accessed use to stop !PageLRU bug
        kernel/printk/printk.c: revert "printk: enable interrupts before calling console_trylock_for_printk()"
        tools/testing/selftests/ipc/msgque.c: improve error handling when not running as root
        fs/seq_file: fallback to vmalloc allocation
        /proc/stat: convert to single_open_size()
        hwpoison: fix the handling path of the victimized page frame that belong to non-LRU
        mm:vmscan: update the trace-vmscan-postprocess.pl for event vmscan/mm_vmscan_lru_isolate
        msync: fix incorrect fstart calculation
        zram: revalidate disk after capacity change
        tools: memory-hotplug fix unexpected operator error
        tools: cpu-hotplug fix unexpected operator error
        autofs4: fix false positive compile error
        slub: fix off by one in number of slab tests
        mm: page_alloc: fix CMA area initialisation when pageblock > MAX_ORDER
      5170a3b2