1. 13 Jun, 2014 18 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 6391f34e
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Most of changes are small and easy cleanup or fixes:
      
         - a few HD-audio Realtek codec fixes and quirks
         - Intel HDMI audio fixes for Broadwell and Haswell / ValleyView
         - FireWire sound stack cleanups
         - a couple of sequencer core fixes
         - compress ABI fix for 64bit
         - conversion to modern ktime*() API"
      
      * tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
        ALSA: hda/realtek - Add more entry for enable HP mute led
        ALSA: hda - Add quirk for external mic on Lifebook U904
        ALSA: hda - fix a fixup value for codec alc293 in the pin_quirk table
        ALSA: intel8x0: Use ktime and ktime_get()
        ALSA: core: Use ktime_get_ts()
        ALSA: hda - verify pin:converter connection on unsol event for HSW and VLV
        ALSA: compress: Cancel the optimization of compiler and fix the size of struct for all platform.
        ALSA: hda - Add quirk for ABit AA8XE
        Revert "ALSA: hda - mask buggy stream DMA0 for Broadwell display controller"
        ALSA: hda - using POS_FIX_LPIB on Broadwell HDMI Audio
        ALSA: hda/realtek - Add support of ALC667 codec
        ALSA: hda/realtek - Add more codec rename
        ALSA: hda/realtek - New vendor ID for ALC233
        ALSA: hda - add two new pin tables
        ALSA: hda/realtek - Add support of ALC891 codec
        ALSA: seq: Continue broadcasting events to ports if one of them fails
        ALSA: bebob: Remove unused function prototype
        ALSA: fireworks: Remove meaningless mutex_destroy()
        ALSA: fireworks: Remove a constant over width to which it's applied
        ALSA: fireworks: Improve comments about Fireworks transaction
        ...
      6391f34e
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 4bdeb312
      Linus Torvalds authored
      Pull dlm fix from David Teigland:
       "This contains one small fix related to resending SCTP messages"
      
      * tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: keep listening connection alive with sctp mode
      4bdeb312
    • Linus Torvalds's avatar
      Merge branch 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security · aa569fa0
      Linus Torvalds authored
      Pull more security layer updates from Serge Hallyn:
       "A few more commits had previously failed to make it through
        security-next into linux-next but this week made it into linux-next.
        At least commit "ima: introduce ima_kernel_read()" was deemed critical
        by Mimi to make this merge window.
      
        This is a temporary tree just for this request.  Mimi has pointed me
        to some previous threads about keeping maintainer trees at the
        previous release, which I'll certainly do for anything long-term,
        after talking with James"
      
      * 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
        ima: introduce ima_kernel_read()
        evm: prohibit userspace writing 'security.evm' HMAC value
        ima: check inode integrity cache in violation check
        ima: prevent unnecessary policy checking
        evm: provide option to protect additional SMACK xattrs
        evm: replace HMAC version with attribute mask
        ima: prevent new digsig xattr from being replaced
      aa569fa0
    • Kailang Yang's avatar
      ALSA: hda/realtek - Add more entry for enable HP mute led · 8a02b164
      Kailang Yang authored
      More HP machine need mute led support.
      Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      8a02b164
    • David Henningsson's avatar
      ALSA: hda - Add quirk for external mic on Lifebook U904 · 2041d564
      David Henningsson authored
      According to the bug reporter (Данило Шеган), the external mic
      starts to work and has proper jack detection if only pin 0x19
      is marked properly as an external headset mic.
      
      AlsaInfo at https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1328587/+attachment/4128991/+files/AlsaInfo.txt
      
      Cc: stable@vger.kernel.org
      BugLink: https://bugs.launchpad.net/bugs/1328587Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      2041d564
    • Hui Wang's avatar
      ALSA: hda - fix a fixup value for codec alc293 in the pin_quirk table · 64eb4280
      Hui Wang authored
      The fixup value for codec alc293 was set to
      ALC269_FIXUP_DELL1_MIC_NO_PRESENCE by a mistake, if we don't fix it,
      the Dock mic will be overwriten by the headset mic, this will make
      the Dock mic can't work.
      
      Cc: David Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      64eb4280
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 6d87c225
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "This has a mix of bug fixes and cleanups.
      
        Alex's patch fixes a rare race in RBD.  Ilya's patches fix an ENOENT
        check when a second rbd image is mapped and a couple memory leaks.
        Zheng fixes several issues with fragmented directories and multiple
        MDSs.  Josh fixes a spin/sleep issue, and Josh and Guangliang's
        patches fix setting and unsetting RBD images read-only.
      
        Naturally there are several other cleanups mixed in for good measure"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits)
        rbd: only set disk to read-only once
        rbd: move calls that may sleep out of spin lock range
        rbd: add ioctl for rbd
        ceph: use truncate_pagecache() instead of truncate_inode_pages()
        ceph: include time stamp in every MDS request
        rbd: fix ida/idr memory leak
        rbd: use reference counts for image requests
        rbd: fix osd_request memory leak in __rbd_dev_header_watch_sync()
        rbd: make sure we have latest osdmap on 'rbd map'
        libceph: add ceph_monc_wait_osdmap()
        libceph: mon_get_version request infrastructure
        libceph: recognize poolop requests in debugfs
        ceph: refactor readpage_nounlock() to make the logic clearer
        mds: check cap ID when handling cap export message
        ceph: remember subtree root dirfrag's auth MDS
        ceph: introduce ceph_fill_fragtree()
        ceph: handle cap import atomically
        ceph: pre-allocate ceph_cap struct for ceph_add_cap()
        ceph: update inode fields according to issued caps
        rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
        ...
      6d87c225
    • Linus Torvalds's avatar
      Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 338c09a9
      Linus Torvalds authored
      Pull OMAP3 updates from Mauro Carvalho Chehab:
       "Some driver improvements on OMAP3.  This series depend on some iommu
        patches already merged"
      
      * 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (26 commits)
        [media] omap3isp: Rename isp_buffer isp_addr field to dma
        [media] omap3isp: Move to videobuf2
        [media] v4l: vb2: Add a function to discard all DONE buffers
        [media] omap3isp: Cancel all queued buffers when stopping the video stream
        [media] omap3isp: Move buffer irqlist to isp_buffer structure
        [media] omap3isp: Move queue irqlock to isp_video structure
        [media] omap3isp: Move queue mutex to isp_video structure
        [media] omap3isp: queue: Don't build scatterlist for kernel buffer
        [media] omap3isp: Use the ARM DMA IOMMU-aware operations
        [media] omap3isp: queue: Use sg_alloc_table_from_pages()
        [media] omap3isp: queue: Map PFNMAP buffers to device
        [media] omap3isp: queue: Fix the dma_map_sg() return value check
        [media] omap3isp: queue: Allocate kernel buffers with dma_alloc_coherent
        [media] omap3isp: queue: Inline the ispmmu_v(un)map functions
        [media] omap3isp: queue: Merge the prepare and sglist functions
        [media] omap3isp: queue: Use sg_table structure
        [media] omap3isp: queue: Move IOMMU handling code to the queue
        [media] omap3isp: video: Set the buffer bytesused field at completion time
        [media] omap3isp: ccdc: Use the DMA API for FPC
        [media] omap3isp: ccdc: Use the DMA API for LSC
        ...
      338c09a9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · ed9ea4ed
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "The highlights this round include:
      
         - Add support for T10 PI pass-through between vhost-scsi +
           virtio-scsi (MST + Paolo + MKP + nab)
         - Add support for T10 PI in qla2xxx target mode (Quinn + MKP + hch +
           nab, merged through scsi.git)
         - Add support for percpu-ida pre-allocation in qla2xxx target code
           (Quinn + nab)
         - A number of iser-target fixes related to hardening the network
           portal shutdown path (Sagi + Slava)
         - Fix response length residual handling for a number of control CDBs
           (Roland + Christophe V.)
         - Various iscsi RFC conformance fixes in the CHAP authentication path
           (Tejas and Calsoft folks + nab)
         - Return TASK_SET_FULL status for tcm_fc(FCoE) DataIn + Response
           failures (Vasu + Jun + nab)
         - Fix long-standing ABORT_TASK + session reset hang (nab)
         - Convert iser-initiator + iser-target to include T10 bytes into EDTL
           (Sagi + Or + MKP + Mike Christie)
         - Fix NULL pointer dereference regression related to XCOPY introduced
           in v3.15 + CC'ed to v3.12.y (nab)"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (34 commits)
        target: Fix NULL pointer dereference for XCOPY in target_put_sess_cmd
        vhost-scsi: Include prot_bytes into expected data transfer length
        TARGET/sbc,loopback: Adjust command data length in case pi exists on the wire
        libiscsi, iser: Adjust data_length to include protection information
        scsi_cmnd: Introduce scsi_transfer_length helper
        target: Report correct response length for some commands
        target/sbc: Check that the LBA and number of blocks are correct in VERIFY
        target/sbc: Remove sbc_check_valid_sectors()
        Target/iscsi: Fix sendtargets response pdu for iser transport
        Target/iser: Fix a wrong dereference in case discovery session is over iser
        iscsi-target: Fix ABORT_TASK + connection reset iscsi_queue_req memory leak
        target: Use complete_all for se_cmd->t_transport_stop_comp
        target: Set CMD_T_ACTIVE bit for Task Management Requests
        target: cleanup some boolean tests
        target/spc: Simplify INQUIRY EVPD=0x80
        tcm_fc: Generate TASK_SET_FULL status for response failures
        tcm_fc: Generate TASK_SET_FULL status for DataIN failures
        iscsi-target: Reject mutual authentication with reflected CHAP_C
        iscsi-target: Remove no-op from iscsit_tpg_del_portal_group
        iscsi-target: Fix CHAP_A parameter list handling
        ...
      ed9ea4ed
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · c1fdb2d3
      Linus Torvalds authored
      Pull kbuild misc updates from Michal Marek:
       "This is the non-critical part of kbuild for v3.16-rc1:
         - make deb-pkg can do s390x and arm64
         - new patterns in scripts/tags.sh
         - scripts/tags.sh skips userspace tools' sources (which sometimes
           have copies of kernel structures) and symlinks
         - improvements to the objdiff tool
         - two new coccinelle patches
         - other minor fixes"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts: objdiff: support directories for the augument of record command
        scripts: objdiff: fix a comment
        scripts: objdiff: change the extension of disassembly from .o to .dis
        scripts: objdiff: improve path flexibility for record command
        scripts: objdiff: remove unnecessary code
        scripts: objdiff: direct error messages to stderr
        scripts: objdiff: get the path to .tmp_objdiff more simply
        deb-pkg: Add automatic support for s390x architecture
        coccicheck: Add unneeded return variable test
        kbuild: Fix a typo in documentation
        kbuild: trivial - use tabs for code indent where possible
        kbuild: trivial - remove trailing empty lines
        coccinelle: Check for missing NULL terminators in of_device_id tables
        scripts/tags.sh: ignore symlink'ed source files
        scripts/tags.sh: add regular expression replacement pattern for memcg
        builddeb: add arm64 in the supported architectures
        builddeb: use $OBJCOPY variable instead of objcopy
        scripts/tags.sh: ignore code of user space tools
        scripts/tags.sh: add pattern for DEFINE_HASHTABLE
        .gitignore: ignore Module.symvers in all directories
      c1fdb2d3
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 1700ff82
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
       "Kbuild changes for v3.16-rc1:
      
         - cross-compilation fix so that cc-option is testing the right
           compiler
         - Fix for make defconfig all
         - Using relative paths to the object and source directory where
           possible, plus fixes for the fallout of the change
         - several cleanups in the Makefiles and scripts
      
        The powerpc fix is from today, because it was only discovered
        recently.  The rest has been in linux-next for some time"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        powerpc: Avoid circular dependency with zImage.%
        kbuild: create include/config directory in scripts/kconfig/Makefile
        kbuild: do not create include/linux directory
        Makefile: Fix unrecognized cross-compiler command line options
        kbuild: do not add "selinux" to subdir- twice
        um: Fix for relative objtree when generating x86 headers
        kbuild: Use relative path when building in a subdir of the source tree
        kbuild: Use relative path when building in the source tree
        kbuild: Use relative path for $(objtree)
        firmware: Use $(quote) in the Makefile
        firmware: Simplify directory creation
        kbuild: trivial - fix comment block indent
        kbuild: trivial - remove trailing spaces
        kbuild: support simultaneous "make %config" and "make all"
        kbuild: move extra gcc checks to scripts/Makefile.extrawarn
      1700ff82
    • Linus Torvalds's avatar
      Merge tag 'trace-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 8841c8b3
      Linus Torvalds authored
      Pull tracing cleanups and bugfixes from Steven Rostedt:
       "One bug fix that goes back to 3.10.  Accessing a non existent buffer
        if "possible cpus" is greater than actual CPUs (including offline
        CPUs).
      
        Namhyung Kim did some reviews of the patches I sent this merge window
        and found a memory leak and had a few clean ups"
      
      * tag 'trace-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix check of ftrace_trace_arrays list_empty() check
        tracing: Fix leak of per cpu max data in instances
        tracing: Cleanup saved_cmdlines_size changes
        ring-buffer: Check if buffer exists before polling
      8841c8b3
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · b7c8c194
      Linus Torvalds authored
      Pull more powerpc updates from Ben Herrenschmidt:
       "Here are the remaining bits I was mentioning earlier.  Mostly bug
        fixes and new selftests from Michael (yay !).  He also removed the WSP
        platform and A2 core support which were dead before release, so less
        clutter.
      
        One little "feature" I snuck in is the doorbell IPI support for
        non-virtualized P8 which speeds up IPIs significantly between threads
        of a core"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
        powerpc/book3s: Fix some ABIv2 issues in machine check code
        powerpc/book3s: Fix guest MC delivery mechanism to avoid soft lockups in guest.
        powerpc/book3s: Increment the mce counter during machine_check_early call.
        powerpc/book3s: Add stack overflow check in machine check handler.
        powerpc/book3s: Fix machine check handling for unhandled errors
        powerpc/eeh: Dump PE location code
        powerpc/powernv: Enable POWER8 doorbell IPIs
        powerpc/cpuidle: Only clear LPCR decrementer wakeup bit on fast sleep entry
        powerpc/powernv: Fix killed EEH event
        powerpc: fix typo 'CONFIG_PMAC'
        powerpc: fix typo 'CONFIG_PPC_CPU'
        powerpc/powernv: Don't escalate non-existing frozen PE
        powerpc/eeh: Report frozen parent PE prior to child PE
        powerpc/eeh: Clear frozen state for child PE
        powerpc/powernv: Reduce panic timeout from 180s to 10s
        powerpc/xmon: avoid format string leaking to printk
        selftests/powerpc: Add tests of PMU EBBs
        selftests/powerpc: Add support for skipping tests
        selftests/powerpc: Put the test in a separate process group
        selftests/powerpc: Fix instruction loop for ABIv2 (LE)
        ...
      b7c8c194
    • Linus Torvalds's avatar
      Merge tag 'blackfin-for-linus' of... · 88bbfb4a
      Linus Torvalds authored
      Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      
      Pull blackfin updates from Steven Miao.
      
      * tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
        Revert "blackfin: dma: current count mmr is read only"
        bf533: fix build error: add linux/gpio.h
      88bbfb4a
    • Linus Torvalds's avatar
      Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 71998d1b
      Linus Torvalds authored
      Pull x86 irq fixes from Ingo Molnar:
       "Two changes: a cpu-hotplug/irq race fix, plus a HyperV related fix"
      
      * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Fix fixup_irqs() error handling
        x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriately
      71998d1b
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b2e09f63
      Linus Torvalds authored
      Pull more scheduler updates from Ingo Molnar:
       "Second round of scheduler changes:
         - try-to-wakeup and IPI reduction speedups, from Andy Lutomirski
         - continued power scheduling cleanups and refactorings, from Nicolas
           Pitre
         - misc fixes and enhancements"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/deadline: Delete extraneous extern for to_ratio()
        sched/idle: Optimize try-to-wake-up IPI
        sched/idle: Simplify wake_up_idle_cpu()
        sched/idle: Clear polling before descheduling the idle thread
        sched, trace: Add a tracepoint for IPI-less remote wakeups
        cpuidle: Set polling in poll_idle
        sched: Remove redundant assignment to "rt_rq" in update_curr_rt(...)
        sched: Rename capacity related flags
        sched: Final power vs. capacity cleanups
        sched: Remove remaining dubious usage of "power"
        sched: Let 'struct sched_group_power' care about CPU capacity
        sched/fair: Disambiguate existing/remaining "capacity" usage
        sched/fair: Change "has_capacity" to "has_free_capacity"
        sched/fair: Remove "power" from 'struct numa_stats'
        sched: Fix signedness bug in yield_to()
        sched/fair: Use time_after() in record_wakee()
        sched/balancing: Reduce the rate of needless idle load balancing
        sched/fair: Fix unlocked reads of some cfs_b->quota/period
      b2e09f63
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3737a127
      Linus Torvalds authored
      Pull more perf updates from Ingo Molnar:
       "A second round of perf updates:
      
         - wide reaching kprobes sanitization and robustization, with the hope
           of fixing all 'probe this function crashes the kernel' bugs, by
           Masami Hiramatsu.
      
         - uprobes updates from Oleg Nesterov: tmpfs support, corner case
           fixes and robustization work.
      
         - perf tooling updates and fixes from Jiri Olsa, Namhyung Ki, Arnaldo
           et al:
              * Add support to accumulate hist periods (Namhyung Kim)
              * various fixes, refactorings and enhancements"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (101 commits)
        perf: Differentiate exec() and non-exec() comm events
        perf: Fix perf_event_comm() vs. exec() assumption
        uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updates
        perf/documentation: Add description for conditional branch filter
        perf/x86: Add conditional branch filtering support
        perf/tool: Add conditional branch filter 'cond' to perf record
        perf: Add new conditional branch filter 'PERF_SAMPLE_BRANCH_COND'
        uprobes: Teach copy_insn() to support tmpfs
        uprobes: Shift ->readpage check from __copy_insn() to uprobe_register()
        perf/x86: Use common PMU interrupt disabled code
        perf/ARM: Use common PMU interrupt disabled code
        perf: Disable sampled events if no PMU interrupt
        perf: Fix use after free in perf_remove_from_context()
        perf tools: Fix 'make help' message error
        perf record: Fix poll return value propagation
        perf tools: Move elide bool into perf_hpp_fmt struct
        perf tools: Remove elide setup for SORT_MODE__MEMORY mode
        perf tools: Fix "==" into "=" in ui_browser__warning assignment
        perf tools: Allow overriding sysfs and proc finding with env var
        perf tools: Consider header files outside perf directory in tags target
        ...
      3737a127
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c29deef3
      Linus Torvalds authored
      Pull more locking changes from Ingo Molnar:
       "This is the second round of locking tree updates for v3.16, offering
        large system scalability improvements:
      
       - optimistic spinning for rwsems, from Davidlohr Bueso.
      
       - 'qrwlocks' core code and x86 enablement, from Waiman Long and PeterZ"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, locking/rwlocks: Enable qrwlocks on x86
        locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
        locking/mutexes: Documentation update/rewrite
        locking/rwsem: Fix checkpatch.pl warnings
        locking/rwsem: Fix warnings for CONFIG_RWSEM_GENERIC_SPINLOCK
        locking/rwsem: Support optimistic spinning
      c29deef3
  2. 12 Jun, 2014 22 commits
    • Dmitry Kasatkin's avatar
      ima: introduce ima_kernel_read() · 0430e49b
      Dmitry Kasatkin authored
      Commit 8aac6270 "move exit_task_namespaces() outside of exit_notify"
      introduced the kernel opps since the kernel v3.10, which happens when
      Apparmor and IMA-appraisal are enabled at the same time.
      
      ----------------------------------------------------------------------
      [  106.750167] BUG: unable to handle kernel NULL pointer dereference at
      0000000000000018
      [  106.750221] IP: [<ffffffff811ec7da>] our_mnt+0x1a/0x30
      [  106.750241] PGD 0
      [  106.750254] Oops: 0000 [#1] SMP
      [  106.750272] Modules linked in: cuse parport_pc ppdev bnep rfcomm
      bluetooth rpcsec_gss_krb5 nfsd auth_rpcgss nfs_acl nfs lockd sunrpc
      fscache dm_crypt intel_rapl x86_pkg_temp_thermal intel_powerclamp
      kvm_intel snd_hda_codec_hdmi kvm crct10dif_pclmul crc32_pclmul
      ghash_clmulni_intel aesni_intel aes_x86_64 glue_helper lrw gf128mul
      ablk_helper cryptd snd_hda_codec_realtek dcdbas snd_hda_intel
      snd_hda_codec snd_hwdep snd_pcm snd_page_alloc snd_seq_midi
      snd_seq_midi_event snd_rawmidi psmouse snd_seq microcode serio_raw
      snd_timer snd_seq_device snd soundcore video lpc_ich coretemp mac_hid lp
      parport mei_me mei nbd hid_generic e1000e usbhid ahci ptp hid libahci
      pps_core
      [  106.750658] CPU: 6 PID: 1394 Comm: mysqld Not tainted 3.13.0-rc7-kds+ #15
      [  106.750673] Hardware name: Dell Inc. OptiPlex 9010/0M9KCM, BIOS A08
      09/19/2012
      [  106.750689] task: ffff8800de804920 ti: ffff880400fca000 task.ti:
      ffff880400fca000
      [  106.750704] RIP: 0010:[<ffffffff811ec7da>]  [<ffffffff811ec7da>]
      our_mnt+0x1a/0x30
      [  106.750725] RSP: 0018:ffff880400fcba60  EFLAGS: 00010286
      [  106.750738] RAX: 0000000000000000 RBX: 0000000000000100 RCX:
      ffff8800d51523e7
      [  106.750764] RDX: ffffffffffffffea RSI: ffff880400fcba34 RDI:
      ffff880402d20020
      [  106.750791] RBP: ffff880400fcbae0 R08: 0000000000000000 R09:
      0000000000000001
      [  106.750817] R10: 0000000000000000 R11: 0000000000000001 R12:
      ffff8800d5152300
      [  106.750844] R13: ffff8803eb8df510 R14: ffff880400fcbb28 R15:
      ffff8800d51523e7
      [  106.750871] FS:  0000000000000000(0000) GS:ffff88040d200000(0000)
      knlGS:0000000000000000
      [  106.750910] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  106.750935] CR2: 0000000000000018 CR3: 0000000001c0e000 CR4:
      00000000001407e0
      [  106.750962] Stack:
      [  106.750981]  ffffffff813434eb ffff880400fcbb20 ffff880400fcbb18
      0000000000000000
      [  106.751037]  ffff8800de804920 ffffffff8101b9b9 0001800000000000
      0000000000000100
      [  106.751093]  0000010000000000 0000000000000002 000000000000000e
      ffff8803eb8df500
      [  106.751149] Call Trace:
      [  106.751172]  [<ffffffff813434eb>] ? aa_path_name+0x2ab/0x430
      [  106.751199]  [<ffffffff8101b9b9>] ? sched_clock+0x9/0x10
      [  106.751225]  [<ffffffff8134a68d>] aa_path_perm+0x7d/0x170
      [  106.751250]  [<ffffffff8101b945>] ? native_sched_clock+0x15/0x80
      [  106.751276]  [<ffffffff8134aa73>] aa_file_perm+0x33/0x40
      [  106.751301]  [<ffffffff81348c5e>] common_file_perm+0x8e/0xb0
      [  106.751327]  [<ffffffff81348d78>] apparmor_file_permission+0x18/0x20
      [  106.751355]  [<ffffffff8130c853>] security_file_permission+0x23/0xa0
      [  106.751382]  [<ffffffff811c77a2>] rw_verify_area+0x52/0xe0
      [  106.751407]  [<ffffffff811c789d>] vfs_read+0x6d/0x170
      [  106.751432]  [<ffffffff811cda31>] kernel_read+0x41/0x60
      [  106.751457]  [<ffffffff8134fd45>] ima_calc_file_hash+0x225/0x280
      [  106.751483]  [<ffffffff8134fb52>] ? ima_calc_file_hash+0x32/0x280
      [  106.751509]  [<ffffffff8135022d>] ima_collect_measurement+0x9d/0x160
      [  106.751536]  [<ffffffff810b552d>] ? trace_hardirqs_on+0xd/0x10
      [  106.751562]  [<ffffffff8134f07c>] ? ima_file_free+0x6c/0xd0
      [  106.751587]  [<ffffffff81352824>] ima_update_xattr+0x34/0x60
      [  106.751612]  [<ffffffff8134f0d0>] ima_file_free+0xc0/0xd0
      [  106.751637]  [<ffffffff811c9635>] __fput+0xd5/0x300
      [  106.751662]  [<ffffffff811c98ae>] ____fput+0xe/0x10
      [  106.751687]  [<ffffffff81086774>] task_work_run+0xc4/0xe0
      [  106.751712]  [<ffffffff81066fad>] do_exit+0x2bd/0xa90
      [  106.751738]  [<ffffffff8173c958>] ? retint_swapgs+0x13/0x1b
      [  106.751763]  [<ffffffff8106780c>] do_group_exit+0x4c/0xc0
      [  106.751788]  [<ffffffff81067894>] SyS_exit_group+0x14/0x20
      [  106.751814]  [<ffffffff8174522d>] system_call_fastpath+0x1a/0x1f
      [  106.751839] Code: c3 0f 1f 44 00 00 55 48 89 e5 e8 22 fe ff ff 5d c3
      0f 1f 44 00 00 55 65 48 8b 04 25 c0 c9 00 00 48 8b 80 28 06 00 00 48 89
      e5 5d <48> 8b 40 18 48 39 87 c0 00 00 00 0f 94 c0 c3 0f 1f 80 00 00 00
      [  106.752185] RIP  [<ffffffff811ec7da>] our_mnt+0x1a/0x30
      [  106.752214]  RSP <ffff880400fcba60>
      [  106.752236] CR2: 0000000000000018
      [  106.752258] ---[ end trace 3c520748b4732721 ]---
      ----------------------------------------------------------------------
      
      The reason for the oops is that IMA-appraisal uses "kernel_read()" when
      file is closed. kernel_read() honors LSM security hook which calls
      Apparmor handler, which uses current->nsproxy->mnt_ns. The 'guilty'
      commit changed the order of cleanup code so that nsproxy->mnt_ns was
      not already available for Apparmor.
      
      Discussion about the issue with Al Viro and Eric W. Biederman suggested
      that kernel_read() is too high-level for IMA. Another issue, except
      security checking, that was identified is mandatory locking. kernel_read
      honors it as well and it might prevent IMA from calculating necessary hash.
      It was suggested to use simplified version of the function without security
      and locking checks.
      
      This patch introduces special version ima_kernel_read(), which skips security
      and mandatory locking checking. It prevents the kernel oops to happen.
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Suggested-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      Cc: <stable@vger.kernel.org>
      0430e49b
    • Mimi Zohar's avatar
      evm: prohibit userspace writing 'security.evm' HMAC value · 2fb1c9a4
      Mimi Zohar authored
      Calculating the 'security.evm' HMAC value requires access to the
      EVM encrypted key.  Only the kernel should have access to it.  This
      patch prevents userspace tools(eg. setfattr, cp --preserve=xattr)
      from setting/modifying the 'security.evm' HMAC value directly.
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      Cc: <stable@vger.kernel.org>
      2fb1c9a4
    • Dmitry Kasatkin's avatar
      ima: check inode integrity cache in violation check · 14503eb9
      Dmitry Kasatkin authored
      When IMA did not support ima-appraisal, existance of the S_IMA flag
      clearly indicated that the file was measured. With IMA appraisal S_IMA
      flag indicates that file was measured and/or appraised. Because of
      this, when measurement is not enabled by the policy, violations are
      still reported.
      
      To differentiate between measurement and appraisal policies this
      patch checks the inode integrity cache flags.  The IMA_MEASURED
      flag indicates whether the file was actually measured, while the
      IMA_MEASURE flag indicates whether the file should be measured.
      Unfortunately, the IMA_MEASURED flag is reset to indicate the file
      needs to be re-measured.  Thus, this patch checks the IMA_MEASURE
      flag.
      
      This patch limits the false positive violation reports, but does
      not fix it entirely.  The IMA_MEASURE/IMA_MEASURED flags are
      indications that, at some point in time, the file opened for read
      was in policy, but might not be in policy now (eg. different uid).
      Other changes would be needed to further limit false positive
      violation reports.
      
      Changelog:
      - expanded patch description based on conversation with Roberto (Mimi)
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      14503eb9
    • Dmitry Kasatkin's avatar
      ima: prevent unnecessary policy checking · b882fae2
      Dmitry Kasatkin authored
      ima_rdwr_violation_check is called for every file openning.
      The function checks the policy even when violation condition
      is not met. It causes unnecessary policy checking.
      
      This patch does policy checking only if violation condition is met.
      
      Changelog:
      - check writecount is greater than zero (Mimi)
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      b882fae2
    • Dmitry Kasatkin's avatar
      evm: provide option to protect additional SMACK xattrs · 3e38df56
      Dmitry Kasatkin authored
      Newer versions of SMACK introduced following security xattrs:
      SMACK64EXEC, SMACK64TRANSMUTE and SMACK64MMAP.
      
      To protect these xattrs, this patch includes them in the HMAC
      calculation.  However, for backwards compatibility with existing
      labeled filesystems, including these xattrs needs to be
      configurable.
      
      Changelog:
      - Add SMACK dependency on new option (Mimi)
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      3e38df56
    • Dmitry Kasatkin's avatar
      evm: replace HMAC version with attribute mask · d3b33679
      Dmitry Kasatkin authored
      Using HMAC version limits the posibility to arbitrarily add new
      attributes such as SMACK64EXEC to the hmac calculation.
      
      This patch replaces hmac version with attribute mask.
      Desired attributes can be enabled with configuration parameter.
      It allows to build kernels which works with previously labeled
      filesystems.
      
      Currently supported attribute is 'fsuuid' which is equivalent of
      the former version 2.
      Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      d3b33679
    • Mimi Zohar's avatar
      ima: prevent new digsig xattr from being replaced · 060bdebf
      Mimi Zohar authored
      Even though a new xattr will only be appraised on the next access,
      set the DIGSIG flag to prevent a signature from being replaced with
      a hash on file close.
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      060bdebf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · f9da455b
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
       1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.
      
       2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
          Benniston.
      
       3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
          Mork.
      
       4) BPF now has a "random" opcode, from Chema Gonzalez.
      
       5) Add more BPF documentation and improve test framework, from Daniel
          Borkmann.
      
       6) Support TCP fastopen over ipv6, from Daniel Lee.
      
       7) Add software TSO helper functions and use them to support software
          TSO in mvneta and mv643xx_eth drivers.  From Ezequiel Garcia.
      
       8) Support software TSO in fec driver too, from Nimrod Andy.
      
       9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.
      
      10) Handle broadcasts more gracefully over macvlan when there are large
          numbers of interfaces configured, from Herbert Xu.
      
      11) Allow more control over fwmark used for non-socket based responses,
          from Lorenzo Colitti.
      
      12) Do TCP congestion window limiting based upon measurements, from Neal
          Cardwell.
      
      13) Support busy polling in SCTP, from Neal Horman.
      
      14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.
      
      15) Bridge promisc mode handling improvements from Vlad Yasevich.
      
      16) Don't use inetpeer entries to implement ID generation any more, it
          performs poorly, from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
        rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
        tcp: fixing TLP's FIN recovery
        net: fec: Add software TSO support
        net: fec: Add Scatter/gather support
        net: fec: Increase buffer descriptor entry number
        net: fec: Factorize feature setting
        net: fec: Enable IP header hardware checksum
        net: fec: Factorize the .xmit transmit function
        bridge: fix compile error when compiling without IPv6 support
        bridge: fix smatch warning / potential null pointer dereference
        via-rhine: fix full-duplex with autoneg disable
        bnx2x: Enlarge the dorq threshold for VFs
        bnx2x: Check for UNDI in uncommon branch
        bnx2x: Fix 1G-baseT link
        bnx2x: Fix link for KR with swapped polarity lane
        sctp: Fix sk_ack_backlog wrap-around problem
        net/core: Add VF link state control policy
        net/fsl: xgmac_mdio is dependent on OF_MDIO
        net/fsl: Make xgmac_mdio read error message useful
        net_sched: drr: warn when qdisc is not work conserving
        ...
      f9da455b
    • Linus Torvalds's avatar
      Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 0e04c641
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
       "This pull request is later than I'd have liked because I was waiting
        for some performance data to help finally justify sending the
        long-standing dm-crypt cpu scalability improvements upstream.
      
        Unfortunately we came up short, so those dm-crypt changes will
        continue to wait, but it seems we're not far off.
      
         . Add dm_accept_partial_bio interface to DM core to allow DM targets
           to only process a portion of a bio, the remainder being sent in the
           next bio.  This enables the old dm snapshot-origin target to only
           split write bios on chunk boundaries, read bios are now sent to the
           origin device unchanged.
      
         . Add DM core support for disabling WRITE SAME if the underlying SCSI
           layer disables it due to command failure.
      
         . Reduce lock contention in DM's bio-prison.
      
         . A few small cleanups and fixes to dm-thin and dm-era"
      
      * tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm thin: update discard_granularity to reflect the thin-pool blocksize
        dm bio prison: implement per bucket locking in the dm_bio_prison hash table
        dm: remove symbol export for dm_set_device_limits
        dm: disable WRITE SAME if it fails
        dm era: check for a non-NULL metadata object before closing it
        dm thin: return ENOSPC instead of EIO when error_if_no_space enabled
        dm thin: cleanup noflush_work to use a proper completion
        dm snapshot: do not split read bios sent to snapshot-origin target
        dm snapshot: allocate a per-target structure for snapshot-origin target
        dm: introduce dm_accept_partial_bio
        dm: change sector_count member in clone_info from sector_t to unsigned
      0e04c641
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7550cfab
      Linus Torvalds authored
      Pull more PCI updates from Bjorn Helgaas:
       "Here are some more things I'd like to see in v3.16-rc1:
      
         - DMA alias iterator, part of some work to fix IOMMU issues
         - MVEBU, Tegra, DesignWare changes that I forgot to include before
         - Some whitespace code cleanup
      
        Details:
      
        IOMMU
          - Add DMA alias iterator (Alex Williamson)
          - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson)
          - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson)
          - Add DMA alias quirk for HighPoint devices (Jérôme Carretero)
      
        MSI
          - Fix leak in free_msi_irqs() (Alexei Starovoitov)
      
        Marvell MVEBU
          - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
          - Avoid setting an undefined window size (Jason Gunthorpe)
          - Allow several windows with the same target/attribute (Thomas Petazzoni)
          - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni)
          - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau)
      
        NVIDIA Tegra
          - Use new OF interrupt mapping when possible (Lucas Stach)
      
        Synopsys DesignWare
          - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
          - Use new OF interrupt mapping when possible (Lucas Stach)
          - Split Exynos and i.MX bindings (Lucas Stach)
          - Fix comment for setting number of lanes (Mohit Kumar)
          - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar)
      
        Miscellaneous
          - EXPORT_SYMBOL cleanup (Ryan Desfosses)
          - Whitespace cleanup (Ryan Desfosses)
          - Merge multi-line quoted strings (Ryan Desfosses)"
      
      * tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
        PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
        PCI/MSI: Fix memory leak in free_msi_irqs()
        PCI: Merge multi-line quoted strings
        PCI: Whitespace cleanup
        PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
        PCI: Add bridge DMA alias quirk for ITE bridge
        PCI: designware: Split Exynos and i.MX bindings
        PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges
        PCI: Add support for PCIe-to-PCI bridge DMA alias quirks
        PCI: Add function 1 DMA alias quirk for Marvell devices
        PCI: Add function 0 DMA alias quirk for Ricoh devices
        PCI: Add support for DMA alias quirks
        PCI: Convert pci_dev_flags definitions to bit shifts
        PCI: Add DMA alias iterator
        PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type
        PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock
        PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
        PCI: designware: Use new OF interrupt mapping when possible
        PCI: designware: Fix iATU programming for cfg1, io and mem viewport
        PCI: designware: Fix comment for setting number of lanes
        ...
      7550cfab
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 19c1940f
      Linus Torvalds authored
      Pull more ACPI and power management updates from Rafael Wysocki:
       "These are fixups on top of the previous PM+ACPI pull request,
        regression fixes (ACPI hotplug, cpufreq ppc-corenet), other bug fixes
        (ACPI reset, cpufreq), new PM trace points for system suspend
        profiling and a copyright notice update.
      
        Specifics:
      
         - I didn't remember correctly that the Hans de Goede's ACPI video
           patches actually didn't flip the video.use_native_backlight
           default, although we had discussed that and decided to do that.
           Since I said we would do that in the previous PM+ACPI pull request,
           make that change for real now.
      
         - ACPI bus check notifications for PCI host bridges don't cause the
           bus below the host bridge to be checked for changes as they should
           because of a mistake in the ACPI-based PCI hotplug (ACPIPHP)
           subsystem that forgets to add hotplug contexts to PCI host bridge
           ACPI device objects.  Create hotplug contexts for PCI host bridges
           too as appropriate.
      
         - Revert recent cpufreq commit related to the big.LITTLE cpufreq
           driver that breaks arm64 builds.
      
         - Fix for a regression in the ppc-corenet cpufreq driver introduced
           during the 3.15 cycle and causing the driver to use the remainder
           from do_div instead of the quotient.  From Ed Swarthout.
      
         - Resets triggered by panic activate a BUG_ON() in vmalloc.c on
           systems where the ACPI reset register is located in memory address
           space.  Fix from Randy Wright.
      
         - Fix for a problem with cpufreq governors that decisions made by
           them may be suboptimal due to the fact that deferrable timers are
           used by them for CPU load sampling.  From Srivatsa S Bhat.
      
         - Fix for a problem with the Tegra cpufreq driver where the CPU
           frequency is temporarily switched to a "stable" level that is
           different from both the initial and target frequencies during
           transitions which causes udelay() to expire earlier than it should
           sometimes.  From Viresh Kumar.
      
         - New trace points and rework of some existing trace points for
           system suspend/resume profiling from Todd Brandt.
      
         - Assorted cpufreq fixes and cleanups from Stratos Karafotis and
           Viresh Kumar.
      
         - Copyright notice update for suspend-and-cpuhotplug.txt from
           Srivatsa S Bhat"
      
      * tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges
        PM / sleep: trace events for device PM callbacks
        cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
        cpufreq: tegra: update comment for clarity
        cpufreq: intel_pstate: Remove duplicate CPU ID check
        cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
        PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt
        cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
        cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
        PM / sleep: trace events for suspend/resume
        cpufreq: ppc-corenet-cpu-freq: do_div use quotient
        Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
        cpufreq: Tegra: implement intermediate frequency callbacks
        cpufreq: add support for intermediate (stable) frequencies
        ACPI / video: Change the default for video.use_native_backlight to 1
        ACPI: Fix bug when ACPI reset register is implemented in system memory
      19c1940f
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · 7c574cf6
      Linus Torvalds authored
      Pull LED updates from Bryan Wu:
       "I just found merge window is open and I'm quite busy and almost forget
        to send out this pull request.  Thanks Russell and Alexandre ping me
        about this.
      
        So basically we got some clean up and leds-pwm fixing patches from
        Russell"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
        leds: Remove duplicated OOM message for individual driver
        drivers/leds: Replace __get_cpu_var use through this_cpu_ptr
        leds: lp55xx: add DT bindings for LP55231
        leds: 88pm860x: Fix missing refcount decrement for parent of_node
        leds: 88pm860x: Use of_get_child_by_name
        leds: leds-pwm: add DT support for LEDs wired to supply
        leds: leds-pwm: implement PWM inversion
        leds: leds-pwm: convert OF parsing code to use led_pwm_add()
        leds: leds-pwm: provide a common function to setup a single led-pwm device
        leds: pca9685: Remove leds-pca9685 driver
        dell-led: add mic mute led interface
      7c574cf6
    • Linus Torvalds's avatar
      Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · af76004c
      Linus Torvalds authored
      Pull backlight fixes from Lee Jones:
       "This merely contains some very basic build/run-time bug fixes"
      
      * tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
        video/backlight: s6e63m0: Fix string type mismatch
        video/backlight: LP8788 needs PWM
        video/backlight: LP855X needs PWM
        video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
        video/backlight: LM3630A needs PWM
      af76004c
    • Nicholas Bellinger's avatar
      target: Fix NULL pointer dereference for XCOPY in target_put_sess_cmd · 0ed6e189
      Nicholas Bellinger authored
      This patch fixes a NULL pointer dereference regression bug that was
      introduced with:
      
      commit 1e1110c4
      Author: Mikulas Patocka <mpatocka@redhat.com>
      Date:   Sat May 17 06:49:22 2014 -0400
      
          target: fix memory leak on XCOPY
      
      Now that target_put_sess_cmd() -> kref_put_spinlock_irqsave() is
      called with a valid se_cmd->cmd_kref, a NULL pointer dereference
      is triggered because the XCOPY passthrough commands don't have
      an associated se_session pointer.
      
      To address this bug, go ahead and checking for a NULL se_sess pointer
      within target_put_sess_cmd(), and call se_cmd->se_tfo->release_cmd()
      to release the XCOPY's xcopy_pt_cmd memory.
      Reported-by: default avatarThomas Glanzmann <thomas@glanzmann.de>
      Cc: Thomas Glanzmann <thomas@glanzmann.de>
      Cc: Mikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org # 3.12+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      0ed6e189
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · bae14e7a
      Linus Torvalds authored
      Pull more MFD updates from Lee Jones:
       "I missed collecting these patches due to a branch/tag naming
        ambiguity.  Completely my own fault, as I mindlessly named a branch
        and tag identically.  Sorry for the fuss.
      
        This pull-request contains some misplaced patches from Tony Lindgren
        that should have been part of the initial one"
      
      * tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
        mfd: twl4030-power: Add support for board specific configuration
        mfd: twl4030-power: Add recommended idle configuration
        mfd: twl4030-power: Add generic reset configuration
        mfd: twl4030-power: Fix some defines for SW_EVENTS
        mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier
      bae14e7a
    • Linus Torvalds's avatar
      Merge tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc · 171c0621
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes for 3.16.
      
         - fix some various compiler warnings
         - make atmel-mci compile again
         - fix regression for sdhci-msm"
      
      * tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: simplify SDHCI Kconfig dependencies
        mmc: omap: don't select TPS65010
        mmc: mvsdio: avoid compiler warning
        mmc: atmel-mci: incude asm/cacheclush.h
        mmc: sdhci-msm: Fix fallout from sdhci refactoring
        mmc: usdhi6rol0: fix compiler warnings
      171c0621
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 682b7c1c
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm merge window pull request, changes all over the
        place, mostly normal levels of churn.
      
        Highlights:
      
        Core drm:
           More cleanups, fix race on connector/encoder naming, docs updates,
           object locking rework in prep for atomic modeset
      
        i915:
           mipi DSI support, valleyview power fixes, cursor size fixes,
           execlist refactoring, vblank improvements, userptr support, OOM
           handling improvements
      
        radeon:
           GPUVM tuning and large page size support, gart fixes, deep color
           HDMI support, HDMI audio cleanups
      
        nouveau:
           - displayport rework should fix lots of issues
           - initial gk20a support
           - gk110b support
           - gk208 fixes
      
        exynos:
           probe order fixes, HDMI changes, IPP consolidation
      
        msm:
           debugfs updates, misc fixes
      
        ast:
           ast2400 support, sync with UMS driver
      
        tegra:
           cleanups, hdmi + hw cursor for Tegra 124.
      
        panel:
           fixes existing panels add some new ones.
      
        ipuv3:
           moved from staging to drivers/gpu"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits)
        drm/nouveau/disp/dp: fix tmds passthrough on dp connector
        drm/nouveau/dp: probe dpcd to determine connectedness
        drm/nv50-: trigger update after all connectors disabled
        drm/nv50-: prepare for attaching a SOR to multiple heads
        drm/gf119-/disp: fix debug output on update failure
        drm/nouveau/disp/dp: make use of postcursor when its available
        drm/g94-/disp/dp: take max pullup value across all lanes
        drm/nouveau/bios/dp: parse lane postcursor data
        drm/nouveau/dp: fix support for dpms
        drm/nouveau: register a drm_dp_aux channel for each dp connector
        drm/g94-/disp: add method to power-off dp lanes
        drm/nouveau/disp/dp: maintain link in response to hpd signal
        drm/g94-/disp: bash and wait for something after changing lane power regs
        drm/nouveau/disp/dp: split link config/power into two steps
        drm/nv50/disp: train PIOR-attached DP from second supervisor
        drm/nouveau/disp/dp: make use of existing output data for link training
        drm/gf119/disp: start removing direct vbios parsing from supervisor
        drm/nv50/disp: start removing direct vbios parsing from supervisor
        drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal
        drm/nouveau/disp/dp: create subclass for dp outputs
        ...
      682b7c1c
    • Michal Schmidt's avatar
      rtnetlink: fix userspace API breakage for iproute2 < v3.9.0 · e5eca6d4
      Michal Schmidt authored
      When running RHEL6 userspace on a current upstream kernel, "ip link"
      fails to show VF information.
      
      The reason is a kernel<->userspace API change introduced by commit
      88c5b5ce ("rtnetlink: Call nlmsg_parse() with correct header length"),
      after which the kernel does not see iproute2's IFLA_EXT_MASK attribute
      in the netlink request.
      
      iproute2 adjusted for the API change in its commit 63338dca4513
      ("libnetlink: Use ifinfomsg instead of rtgenmsg in rtnl_wilddump_req_filter").
      
      The problem has been noticed before:
      http://marc.info/?l=linux-netdev&m=136692296022182&w=2
      (Subject: Re: getting VF link info seems to be broken in 3.9-rc8)
      
      We can do better than tell those with old userspace to upgrade. We can
      recognize the old iproute2 in the kernel by checking the netlink message
      length. Even when including the IFLA_EXT_MASK attribute, its netlink
      message is shorter than struct ifinfomsg.
      
      With this patch "ip link" shows VF information in both old and new
      iproute2 versions.
      Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e5eca6d4
    • Per Hurtig's avatar
      tcp: fixing TLP's FIN recovery · bef1909e
      Per Hurtig authored
      Fix to a problem observed when losing a FIN segment that does not
      contain data.  In such situations, TLP is unable to recover from
      *any* tail loss and instead adds at least PTO ms to the
      retransmission process, i.e., RTO = RTO + PTO.
      Signed-off-by: default avatarPer Hurtig <per.hurtig@kau.se>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Acked-by: default avatarNandita Dukkipati <nanditad@google.com>
      Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bef1909e
    • David S. Miller's avatar
      Merge branch 'fec' · fba0e1a3
      David S. Miller authored
      Fugang Duan says:
      
      ====================
      net: fec: Enable Software TSO to improve the tx performance
      
      Add SG and software TSO support for FEC.
      This feature allows to improve outbound throughput performance.
      Tested on imx6dl sabresd board, running iperf tcp tests shows:
              * 82% improvement comparing with NO SG & TSO patch
      
      $ ethtool -K eth0 sg on
      $ ethtool -K eth0 tso on
      [  3] local 10.192.242.108 port 35388 connected with 10.192.242.167 port 5001
      [ ID] Interval       Transfer     Bandwidth
      [  3]  0.0- 3.0 sec   181 MBytes   506 Mbits/sec
      * cpu loading is 30%
      
      $ ethtool -K eth0 sg off
      $ ethtool -K eth0 tso off
      [  3] local 10.192.242.108 port 52618 connected with 10.192.242.167 port 5001
      [ ID] Interval       Transfer     Bandwidth
      [  3]  0.0- 3.0 sec  99.5 MBytes   278 Mbits/sec
      
      FEC HW support IP header and TCP/UDP hw checksum, support multi buffer descriptor transfer
      one frame, but don't support HW TSO. And imx6q/dl SOC FEC Gbps speed has HW bus Bandwidth
      limitation (400Mbps ~ 700Mbps), imx6sx SOC FEC Gbps speed has no HW bandwidth limitation.
      
      The patch set just enable TSO feature, which is done following the mv643xx_eth driver.
      
      Test result analyze:
      imx6dl sabresd board: there have 82% improvement, since imx6dl FEC HW has bandwidth limitation,
                            the performance with SW TSO is a milestone.
      
      Addition test:
      imx6sx sdb board:
      upstream still don't support imx6sx due to some patches being upstream... they use same FEC IP.
      Use the SW TSO patches test imx6sx sdb board in internal kernel tree:
      No SW TSO patch: tx bandwidth 840Mbps, cpu loading is 100%.
      SW TSO patch:    tx bandwidth 942Mbps, cpu loading is 65%.
      It means the patch set have great improvement for imx6sx FEC performance.
      
      V2:
      * From Frank Li's suggestion:
      	Change the API "fec_enet_txdesc_entry_free" name to "fec_enet_get_free_txdesc_num".
      * Summary David Laight and Eric Dumazet's thoughts:
      	RX BD entry number change to 256.
      * From ezequiel's suggestion:
      	Follow the latest TSO fixes from his solution to rework the queue stop/wake-up.
      	Avoid unmapping the TSO header buffers.
      * From Eric Dumazet's suggestion:
      	Avoid more bytes copy, just copying the unaligned part of the payload into first
      	descriptor. The suggestion will bring more complex for the driver, and imx6dl FEC
      	DMA need 16 bytes alignment, but cpu loading is not problem that cpu loading is
      	30%, the current performance is so better. Later chip like imx6sx Gigbit FEC DMA
      	support byte alignment, so there don't exist memory copy. So, the V2 version drop
      	the suggestion.
      	Anyway, thanks for Eric's response and suggestion.
      
      V3:
      * From David Laight's feedback:
      	Decide to drop RX BD entry number change for the SW TSO patch set.
      	I will generate one separate patch to increase RX BDs entry for interrupt coalescing feature which
      	will be supported in my later patch set.
      
      V4:
      * From David Laight's feedback:
      	Remove the conditional in .fec_enet_get_bd_index().
      
      V5:
      * Patch #4 update:
        From David Laight's feedback:
      	"expect fec_enet_get_free_txdesc_num() to return one less than it does currently."
      	Change the function:
      	Return space available, 0..size-1.  it always leave one free entry. Which is same as linux circ_buf.
      
      Thanks for Eric and ezequiel's help and idea.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fba0e1a3
    • Nimrod Andy's avatar
      net: fec: Add software TSO support · 79f33912
      Nimrod Andy authored
      Add software TSO support for FEC.
      This feature allows to improve outbound throughput performance.
      
      Tested on imx6dl sabresd board, running iperf tcp tests shows:
      - 16.2% improvement comparing with FEC SG patch
      - 82% improvement comparing with NO SG & TSO patch
      
      $ ethtool -K eth0 tso on
      $ iperf -c 10.192.242.167 -t 3 &
      [  3] local 10.192.242.108 port 35388 connected with 10.192.242.167 port 5001
      [ ID] Interval       Transfer     Bandwidth
      [  3]  0.0- 3.0 sec   181 MBytes   506 Mbits/sec
      
      During the testing, CPU loading is 30%.
      Since imx6dl FEC Bandwidth is limited to SOC system bus bandwidth, the
      performance with SW TSO is a milestone.
      
      CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
      CC: Eric Dumazet <eric.dumazet@gmail.com>
      CC: David Laight <David.Laight@ACULAB.COM>
      CC: Li Frank <B20596@freescale.com>
      Signed-off-by: default avatarFugang Duan <B38611@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      79f33912
    • Nimrod Andy's avatar
      net: fec: Add Scatter/gather support · 6e909283
      Nimrod Andy authored
      Add Scatter/gather support for FEC.
      This feature allows to improve outbound throughput performance.
      
      Tested on imx6dl sabresd board:
      Running iperf tests shows a 55.4% improvement.
      
      $ ethtool -K eth0 sg off
      $ iperf -c 10.192.242.167 -t 3 &
      [  3] local 10.192.242.108 port 52618 connected with 10.192.242.167 port 5001
      [ ID] Interval       Transfer     Bandwidth
      [  3]  0.0- 3.0 sec  99.5 MBytes   278 Mbits/sec
      
      $ ethtool -K eth0 sg on
      $ iperf -c 10.192.242.167 -t 3 &
      [  3] local 10.192.242.108 port 52617 connected with 10.192.242.167 port 5001
      [ ID] Interval       Transfer     Bandwidth
      [  3]  0.0- 3.0 sec   154 MBytes   432 Mbits/sec
      
      CC: Li Frank <B20596@freescale.com>
      Signed-off-by: default avatarFugang Duan <B38611@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e909283