1. 19 Dec, 2014 7 commits
    • Jukka Rissanen's avatar
      Bluetooth: 6lowpan: Do not free skb when packet is dropped · 004fa5ed
      Jukka Rissanen authored
      If we need to drop the message because of some error in the
      compression etc, then do not free the skb as that is done
      automatically in other part of networking stack.
      Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      004fa5ed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 00c845db
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix NBMA tunnel mac header handling in GRE, from Timo Teräs.
      
       2) Fix a NAPI race in the fec driver, from Nimrod Andy.
      
       3) The new IFF_VNET_LE bit is outside the size of the flags member it
          is stored in (which is 16-bits), store the state locally in the
          drivers.  From Michael S Tsirkin.
      
       4) We are kicking the tires with the new wireless maintainership
          situation.  Bluetooth fixes via Johan Hedberg, and mac80211 fixes
          from Johannes Berg.
      
       5) Fix locking and leaks in geneve driver, from Jesse Gross.
      
       6) Make netlink TX mmap code always copy, so we don't have to be
          potentially exposed to the user changing the underlying contents
          from underneath us.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (63 commits)
        be2net: Fix incorrect setting of tunnel offload flag in netdev features
        bnx2x: fix typos in "configure"
        xen-netback: support frontends without feature-rx-notify again
        MAINTAINERS: changes for wireless
        cxgb4: Fix decoding QSA module for ethtool get settings
        geneve: Fix races between socket add and release.
        geneve: Remove socket and offload handlers at destruction.
        netlink: Don't reorder loads/stores before marking mmap netlink frame as available
        netlink: Always copy on mmap TX.
        Bluetooth: Fix bug with filter in service discovery optimization
        mac80211: free management frame keys when removing station
        net: Disallow providing non zero VLAN ID for NIC drivers FDB add flow
        net/mlx4: Cache line CQE/EQE stride fixes
        net: fec: Fix NAPI race
        xen-netfront: use napi_complete() correctly to prevent Rx stalling
        ip_tunnel: Add missing validation of encap type to ip_tunnel_encap_setup()
        ip_tunnel: Add sanity checks to ip_tunnel_encap_add_ops()
        net: Allow FIXED_PHY to be modular.
        if_tun: drop broken IFF_VNET_LE
        macvtap: drop broken IFF_VNET_LE
        ...
      00c845db
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 28ee5809
      Linus Torvalds authored
      Pull sparc fix from David Miller:
       "Sparc32 locking bug fix from Andreas Larsson"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: destroy_context() and switch_mm() needs to disable interrupts.
      28ee5809
    • Linus Torvalds's avatar
      Merge tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 22943a6a
      Linus Torvalds authored
      Pull arch/arc updates from Vineet Gupta:
       "Minor updates for ARC for 3.19"
      
      * tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: rename default defconfig
        ARC: [nsimosci] move peripherals to match model to FPGA
        ARC: document memory clobber in irq control macros
        ARC: R-M-W assist locks only needed for !LLSC
        ARC: add power management options
      22943a6a
    • Linus Torvalds's avatar
      Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next · 39757e73
      Linus Torvalds authored
      Pull arch/nios2 fixes from Ley Foon Tan:
       - add definition of ioremap_wc to io.h to fix build error from make
         allmodconfig
       - fix make defconfig
       - fix sparse error
      
      * tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next:
        nios2/uaccess: fix sparse errors
        nios2: enable "make defconfig"
        nios2: add definition of ioremap_wc to io.h
      39757e73
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 66dcff86
      Linus Torvalds authored
      Pull KVM update from Paolo Bonzini:
       "3.19 changes for KVM:
      
         - spring cleaning: removed support for IA64, and for hardware-
           assisted virtualization on the PPC970
      
         - ARM, PPC, s390 all had only small fixes
      
        For x86:
         - small performance improvements (though only on weird guests)
         - usual round of hardware-compliancy fixes from Nadav
         - APICv fixes
         - XSAVES support for hosts and guests.  XSAVES hosts were broken
           because the (non-KVM) XSAVES patches inadvertently changed the KVM
           userspace ABI whenever XSAVES was enabled; hence, this part is
           going to stable.  Guest support is just a matter of exposing the
           feature and CPUID leaves support"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (179 commits)
        KVM: move APIC types to arch/x86/
        KVM: PPC: Book3S: Enable in-kernel XICS emulation by default
        KVM: PPC: Book3S HV: Improve H_CONFER implementation
        KVM: PPC: Book3S HV: Fix endianness of instruction obtained from HEIR register
        KVM: PPC: Book3S HV: Remove code for PPC970 processors
        KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions
        KVM: PPC: Book3S HV: Simplify locking around stolen time calculations
        arch: powerpc: kvm: book3s_paired_singles.c: Remove unused function
        arch: powerpc: kvm: book3s_pr.c: Remove unused function
        arch: powerpc: kvm: book3s.c: Remove some unused functions
        arch: powerpc: kvm: book3s_32_mmu.c: Remove unused function
        KVM: PPC: Book3S HV: Check wait conditions before sleeping in kvmppc_vcore_blocked
        KVM: PPC: Book3S HV: ptes are big endian
        KVM: PPC: Book3S HV: Fix inaccuracies in ICP emulation for H_IPI
        KVM: PPC: Book3S HV: Fix KSM memory corruption
        KVM: PPC: Book3S HV: Fix an issue where guest is paused on receiving HMI
        KVM: PPC: Book3S HV: Fix computation of tlbie operand
        KVM: PPC: Book3S HV: Add missing HPTE unlock
        KVM: PPC: BookE: Improve irq inject tracepoint
        arm/arm64: KVM: Require in-kernel vgic for the arch timers
        ...
      66dcff86
    • Alexander Graf's avatar
      KVM: PPC: E500: Compile fix in this_cpu_write · 91ed9e8a
      Alexander Graf authored
      Commit 69111bac ("powerpc: Replace __get_cpu_var uses") introduced
      compile breakage to the e500 target by introducing invalid automatically
      created C syntax.
      
      Fix up the breakage and make the code compile again.
      Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      91ed9e8a
  2. 18 Dec, 2014 17 commits
  3. 17 Dec, 2014 16 commits
    • Anton Blanchard's avatar
      KVM: PPC: Book3S: Enable in-kernel XICS emulation by default · 476ce5ef
      Anton Blanchard authored
      The in-kernel XICS emulation is faster than doing it all in QEMU
      and it has got a lot of testing, so enable it by default.
      Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
      476ce5ef
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 87c31b39
      Linus Torvalds authored
      Pull user namespace related fixes from Eric Biederman:
       "As these are bug fixes almost all of thes changes are marked for
        backporting to stable.
      
        The first change (implicitly adding MNT_NODEV on remount) addresses a
        regression that was created when security issues with unprivileged
        remount were closed.  I go on to update the remount test to make it
        easy to detect if this issue reoccurs.
      
        Then there are a handful of mount and umount related fixes.
      
        Then half of the changes deal with the a recently discovered design
        bug in the permission checks of gid_map.  Unix since the beginning has
        allowed setting group permissions on files to less than the user and
        other permissions (aka ---rwx---rwx).  As the unix permission checks
        stop as soon as a group matches, and setgroups allows setting groups
        that can not later be dropped, results in a situtation where it is
        possible to legitimately use a group to assign fewer privileges to a
        process.  Which means dropping a group can increase a processes
        privileges.
      
        The fix I have adopted is that gid_map is now no longer writable
        without privilege unless the new file /proc/self/setgroups has been
        set to permanently disable setgroups.
      
        The bulk of user namespace using applications even the applications
        using applications using user namespaces without privilege remain
        unaffected by this change.  Unfortunately this ix breaks a couple user
        space applications, that were relying on the problematic behavior (one
        of which was tools/selftests/mount/unprivileged-remount-test.c).
      
        To hopefully prevent needing a regression fix on top of my security
        fix I rounded folks who work with the container implementations mostly
        like to be affected and encouraged them to test the changes.
      
          > So far nothing broke on my libvirt-lxc test bed. :-)
          > Tested with openSUSE 13.2 and libvirt 1.2.9.
          > Tested-by: Richard Weinberger <richard@nod.at>
      
          > Tested on Fedora20 with libvirt 1.2.11, works fine.
          > Tested-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
      
          > Ok, thanks - yes, unprivileged lxc is working fine with your kernels.
          > Just to be sure I was testing the right thing I also tested using
          > my unprivileged nsexec testcases, and they failed on setgroup/setgid
          > as now expected, and succeeded there without your patches.
          > Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
      
          > I tested this with Sandstorm.  It breaks as is and it works if I add
          > the setgroups thing.
          > Tested-by: Andy Lutomirski <luto@amacapital.net> # breaks things as designed :("
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Unbreak the unprivileged remount tests
        userns; Correct the comment in map_write
        userns: Allow setting gid_maps without privilege when setgroups is disabled
        userns: Add a knob to disable setgroups on a per user namespace basis
        userns: Rename id_map_mutex to userns_state_mutex
        userns: Only allow the creator of the userns unprivileged mappings
        userns: Check euid no fsuid when establishing an unprivileged uid mapping
        userns: Don't allow unprivileged creation of gid mappings
        userns: Don't allow setgroups until a gid mapping has been setablished
        userns: Document what the invariant required for safe unprivileged mappings.
        groups: Consolidate the setgroups permission checks
        mnt: Clear mnt_expire during pivot_root
        mnt: Carefully set CL_UNPRIVILEGED in clone_mnt
        mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
        umount: Do not allow unmounting rootfs.
        umount: Disallow unprivileged mount force
        mnt: Update unprivileged remount test
        mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount
      87c31b39
    • Marcel Holtmann's avatar
      Bluetooth: Fix bug with filter in service discovery optimization · ea8ae251
      Marcel Holtmann authored
      The optimization for filtering out extended inquiry results, advertising
      reports or scan response data based on provided UUID list has a logic
      bug. In case no match is found in the advertising data, the scan
      response is ignored and not checked against the filter. This will lead
      to events being filtered wrongly.
      
      Change the code to actually only drop the events when the scan response
      data is not present. If it is present, it needs to be checked against
      the provided filter.
      
      The patch is a bit more complex than it needs to be. That is because
      it also fixes this compiler warning that some gcc versions produce.
      
        CC      net/bluetooth/mgmt.o
      net/bluetooth/mgmt.c: In function ‘mgmt_device_found’:
      net/bluetooth/mgmt.c:7028:7: warning: ‘match’ may be used uninitialized in this function [-Wmaybe-uninitialized]
        bool match;
             ^
      
      It seems that gcc can not clearly figure out the context of the match
      variable. So just change the branches for the extended inquiry response
      and advertising data around so that it is clear.
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      ea8ae251
    • Linus Torvalds's avatar
      mmu_gather: fix over-eager tlb_flush_mmu_free() calling · f045bbb9
      Linus Torvalds authored
      Dave Hansen reports that commit fb7332a9 ("mmu_gather: move minimal
      range calculations into generic code") caused a performance problem:
      
        "tlb_finish_mmu() goes up about 9x in the profiles (~0.4%->3.6%) and
         tlb_flush_mmu_free() takes about 3.1% of CPU time with the patch
         applied, but does not show up at all on the commit before"
      
      and the reason is that Will moved the test for whether we need to flush
      from tlb_flush_mmu() into tlb_flush_mmu_tlbonly().  But that meant that
      tlb_flush_mmu_free() basically lost that check.
      
      Move it back into tlb_flush_mmu() where it belongs, so that it covers
      both tlb_flush_mmu_tlbonly() _and_ tlb_flush_mmu_free().
      Reported-and-tested-by: default avatarDave Hansen <dave@sr71.net>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f045bbb9
    • Linus Torvalds's avatar
      x86: mm: fix VM_FAULT_RETRY handling · cf3c0a15
      Linus Torvalds authored
      My commit 26178ec1 ("x86: mm: consolidate VM_FAULT_RETRY handling")
      had a really stupid typo: the FAULT_FLAG_USER bit is in the 'flags'
      variable, not the 'fault' variable. Duh,
      
      The one silver lining in this is that Dave finding this at least
      confirms that trinity actually triggers this special path easily, in a
      way normal use does not.
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cf3c0a15
    • Linus Torvalds's avatar
      Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio · cc669743
      Linus Torvalds authored
      Pull VFIO updates from Alex Williamson:
       - s390 support (Frank Blaschka)
       - Enable iommu-type1 for ARM SMMU (Will Deacon)
      
      * tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio:
        drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU
        vfio: make vfio run on s390
      cc669743
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 9f3e1512
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "A balloon enhancement, and a minor race-on-module-unload theoretical
        bug which doesn't merit cc: stable.
      
        All the exciting stuff went via MST this cycle"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio_balloon: free some memory from balloon on OOM
        virtio_balloon: return the amount of freed memory from leak_balloon()
        virtio_blk: fix race at module removal
        virtio: Fix comment typo 'CONFIG_S_FAILED'
      9f3e1512
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2efda904
      Linus Torvalds authored
      Pull thermal management update from Zhang Rui:
       "Summary:
      
         - of-thermal extension to allow drivers to register and use its
           functionality in a better way, without exploiting thermal core.
           From Lukasz Majewski.
      
         - Fix a bug in intel_soc_dts_thermal driver which calls a sleep
           function in interrupt handler.  From Maurice Petallo.
      
         - add a thermal UAPI header file for exporting the thermal generic
           netlink information to user-space.  From Florian Fainelli.
      
         - First round of refactoring in Exynos driver.  Bartlomiej and Lukasz
           are attempting to make it lean and easier to understand.
      
         - New thermal driver for Rockchip (rk3288), with support for DT
           thermal.  From Caesar Wang.
      
         - New thermal driver for Nvidia, Tegra124 SOCTHERM driver, with
           support for DT thermal.  From Mikko Perttunen.
      
         - New cooling device, based on common clock framework.  From Eduardo
           Valentin.
      
         - a couple of small fixes in thermal core framework.  From Srinivas
           Pandruvada, Javi Merino, Luis Henriques.
      
         - Dropping Armada A375-Z1 SoC thermal support as the chip is not in
           the market, armada folks decided to drop its support.
      
         - a couple of small fixes and cleanups in int340x thermal driver"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (58 commits)
        thermal: provide an UAPI header file
        Thermal/int340x: Clear the error value of the last acpi_bus_get_device() call
        thermal/powerclamp: add id for braswell cpu
        thermal: Intel SoC DTS: Don't do thermal zone update inside spin_lock
        Thermal: fix platform_no_drv_owner.cocci warnings
        Thermal/int340x: avoid unnecessary pointer casting
        thermal: int3403: Delete a check before thermal_zone_device_unregister()
        thermal/int3400: export uuids
        thermal: of: Extend current of-thermal.c code to allow setting emulated temp
        thermal: of: Extend of-thermal to export table of trip points
        thermal: of: Rename struct __thermal_trip to struct thermal_trip
        thermal: of: Extend of-thermal.c to provide check if trip point is valid
        thermal: of: Extend of-thermal.c to provide number of trip points
        thermal: Fix error path in thermal_init()
        thermal: lock the thermal zone when switching governors
        thermal: core: ignore invalid trip temperature
        thermal: armada: Remove support for A375-Z1 SoC
        thermal: rockchip: add driver for thermal
        dt-bindings: document Rockchip thermal
        thermal: exynos: remove exynos_tmu_data.h include
        ...
      2efda904
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-3.19-rc1' of... · 0b4954c4
      Linus Torvalds authored
      Merge tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "There are two new drivers, one for the BCM2835 (Raspberry Pi) and one
        used in conjunction with the LCD controller on various Atmel SoCs.
        The Samsung PWM driver can now be built for 64-bit ARM (Exynos7).
      
        A couple of fixes have been applied to the FTM PWM driver and system
        sleep support was added"
      
      * tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling
        pwm: ftm: Add Power Management support for FTM PWM
        pwm: ftm: Add regmap rbtree type cache support
        pwm: ftm: Correctly track usage count
        pwm: samsung: Allow Samsung PWM driver to be enabled on Exynos7
        pwm: add DT bindings documentation for atmel-hlcdc-pwm driver
        pwm: add support for atmel-hlcdc-pwm device
        pwm: Add BCM2835 PWM driver
      0b4954c4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · d797da41
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov:
       "Two new drivers for Elan hardware (for I2C touchpad and touchscreen
        found in several Chromebooks and other devices), a driver for Goodix
        touch panel, and small fixes to Cypress I2C trackpad and other input
        drivers.
      
        Also we switched to use __maybe_unused instead of gating suspend/
        resume code with #ifdef guards to get better compile coverage"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (27 commits)
        Input: gpio_keys - fix warning regarding uninitialized 'button' variable
        Input: add support for Elan eKTH I2C touchscreens
        Input: gpio_keys - fix warning regarding uninitialized  'irq' variable
        Input: cyapa - use 'error' for error codes
        Input: cyapa - fix resuming the device
        Input: gpio_keys - add device tree support for interrupt only keys
        Input: amikbd - allocate temporary keymap buffer on the stack
        Input: amikbd - fix build if !CONFIG_HW_CONSOLE
        Input: lm8323 - missing error check in lm8323_set_disable()
        Input: initialize device counter variables with -1
        Input: initialize input_no to -1 to avoid subtraction
        Input: i8042 - do not try to load on Intel NUC D54250WYK
        Input: atkbd - correct MSC_SCAN events for force_release keys
        Input: cyapa - switch to using managed resources
        Input: lifebook - use "static inline" instead of "inline" in lifebook.h
        Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume
        Input: mouse - use __maybe_unused instead of ifdef around suspend/resume
        Input: misc - use __maybe_unused instead of ifdef around suspend/resume
        Input: cap11xx - support for irq-active-high option
        Input: cap11xx - add support for various cap11xx devices
        ...
      d797da41
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd · d6666be6
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "Summary:
         - Add device tree support for DoC3
      
         - SPI NOR:
              Refactoring, for better layering between spi-nor.c and its
              driver users (e.g., m25p80.c)
      
              New flash device support
      
              Support 6-byte ID strings
      
         - NAND:
              New NAND driver for Allwinner SoC's (sunxi)
      
              GPMI NAND: add support for raw (no ECC) access, for testing
              purposes
      
              Add ATO manufacturer ID
      
              A few odd driver fixes
      
         - MTD tests:
              Allow testers to compensate for OOB bitflips in oobtest
      
              Fix a torturetest regression
      
         - nandsim: Support longer ID byte strings
      
        And more"
      
      * tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd: (63 commits)
        mtd: tests: abort torturetest on erase errors
        mtd: physmap_of: fix potential NULL dereference
        mtd: spi-nor: allow NULL as chip name and try to auto detect it
        mtd: nand: gpmi: add raw oob access functions
        mtd: nand: gpmi: add proper raw access support
        mtd: nand: gpmi: add gpmi_copy_bits function
        mtd: spi-nor: factor out write_enable() for erase commands
        mtd: spi-nor: add support for s25fl128s
        mtd: spi-nor: remove the jedec_id/ext_id
        mtd: spi-nor: add id/id_len for flash_info{}
        mtd: nand: correct the comment of function nand_block_isreserved()
        jffs2: Drop bogus if in comment
        mtd: atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy
        mtd: cafe_nand: drop duplicate .write_page implementation
        mtd: m25p80: Add support for serial flash Spansion S25FL132K
        MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
        mtd: spi-nor: improve wait-till-ready timeout loop
        mtd: delete unnecessary checks before two function calls
        mtd: nand: omap: Fix NAND enumeration on 3430 LDP
        mtd: nand: add ATO manufacturer info
        ...
      d6666be6
    • Linus Torvalds's avatar
      Merge tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 0ea90b9e
      Linus Torvalds authored
      Pull Microblaze fix from Michal Simek:
       "Fix mmap for cache coherent memory"
      
      * tag 'microblaze-3.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Fix mmap for cache coherent memory
      0ea90b9e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 5f5425ef
      Linus Torvalds authored
      Pull security subsystem fixes from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: remove a bogus NULL check
        ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
        KEYS: Fix stale key registration at error path
      5f5425ef
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · c103b21c
      Linus Torvalds authored
      Pull fuse update from Miklos Szeredi:
       "The first part makes sure we don't hold up umount with pending async
        requests.  In addition to being a cleanup, this is a small behavioral
        change (for the better) and unlikely to break anything.
      
        The second part prepares for a cleanup of the fuse device I/O code by
        adding a helper for simple request submission, with some savings in
        line numbers already realized"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: use file_inode() in fuse_file_fallocate()
        fuse: introduce fuse_simple_request() helper
        fuse: reduce max out args
        fuse: hold inode instead of path after release
        fuse: flush requests on umount
        fuse: don't wake up reserved req in fuse_conn_kill()
      c103b21c
    • Yan, Zheng's avatar
      ceph: fix setting empty extended attribute · 0aeff37a
      Yan, Zheng authored
      make sure 'value' is not null. otherwise __ceph_setxattr will remove
      the extended attribute.
      Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      0aeff37a
    • Yan, Zheng's avatar
      ceph: fix mksnap crash · 275dd19e
      Yan, Zheng authored
      mksnap reply only contain 'target', does not contain 'dentry'. So
      it's wrong to use req->r_reply_info.head->is_dentry to detect traceless
      reply.
      Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      275dd19e