1. 07 Dec, 2015 1 commit
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-intel into drm-next · 47c0fd72
      Dave Airlie authored
      New -misc pull. Big thing is Thierry's atomic helpers for system suspend
      resume, which I'd like to use in i915 too. Hence the pull.
      
      * tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-intel:
        drm: keep connector status change logging human readable
        drm/atomic-helper: Reject attempts at re-stealing encoders
        drm/atomic-helper: Implement subsystem-level suspend/resume
        drm: Implement drm_modeset_lock_all_ctx()
        drm/gma500: Add driver private mutex for the fault handler
        drm/gma500: Drop dev->struct_mutex from mmap offset function
        drm/gma500: Drop dev->struct_mutex from fbdev init/teardown code
        drm/gma500: Drop dev->struct_mutex from modeset code
        drm/gma500: Use correct unref in the gem bo create function
        drm/edid: Make the detailed timing CEA/HDMI mode fixup accept up to 5kHz clock difference
        drm/atomic_helper: Add drm_atomic_helper_disable_planes_on_crtc()
        drm: Serialise multiple event readers
        drm: Drop dev->event_lock spinlock around faulting copy_to_user()
      47c0fd72
  2. 04 Dec, 2015 1 commit
  3. 03 Dec, 2015 1 commit
  4. 02 Dec, 2015 2 commits
  5. 01 Dec, 2015 6 commits
  6. 30 Nov, 2015 9 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-11-20-merged' of... · 80d69009
      Dave Airlie authored
      Merge tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      drm-intel-next-2015-11-20-rebased:
      4 weeks because of my vacation, so a bit more:
      - final bits of the typesafe register mmio functions (Ville)
      - power domain fix for hdmi detection (Imre)
      - tons of fixes and improvements to the psr code (Rodrigo)
      - refactoring of the dp detection code (Ander)
      - complete rework of the dmc loader and dc5/dc6 handling (Imre, Patrik and
        others)
      - dp compliance improvements from Shubhangi Shrivastava
      - stop_machine hack from Chris to fix corruptions when updating GTT ptes on bsw
      - lots of fifo underrun fixes from Ville
      - big pile of fbc fixes and improvements from Paulo
      - fix fbdev failures paths (Tvrtko and Lukas Wunner)
      - dp link training refactoring (Ander)
      - interruptible prepare_plane for atomic (Maarten)
      - basic kabylake support (Deepak&Rodrigo)
      - don't leak ringspace on resets (Chris)
      drm-intel-next-2015-10-23:
      - 2nd attempt at atomic watermarks from Matt, but just prep for now
      - fixes all over
      
      * tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel: (209 commits)
        drm/i915: Update DRIVER_DATE to 20151120
        drm/i915: take a power domain reference while checking the HDMI live status
        drm/i915: take a power domain ref only when needed during HDMI detect
        drm/i915: Tear down fbdev if initialization fails
        async: export current_is_async()
        Revert "drm/i915: Initialize HWS page address after GPU reset"
        drm/i915: Fix oops caused by fbdev initialization failure
        drm/i915: Fix i915_ggtt_view_equal to handle rotation correctly
        drm/i915: Stuff rotation params into view union
        drm/i915: Drop return value from intel_fill_fb_ggtt_view
        drm/i915 : Fix to remove unnecsessary checks in postclose function.
        drm/i915: add MISSING_CASE to a few port/aux power domain helpers
        drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect
        drm/i915: Remove platform specific *_dp_detect() functions
        drm/i915: Don't do edp panel detection in g4x_dp_detect()
        drm/i915: Send TP1 TP2/3 even when panel claims no NO_TRAIN_ON_EXIT.
        drm/i915: PSR: Don't Skip aux handshake on DP_PSR_NO_TRAIN_ON_EXIT.
        drm/i915: Reduce PSR re-activation time for VLV/CHV.
        drm/i915: Delay first PSR activation.
        drm/i915: Type safe register read/write
        ...
      80d69009
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-11-26' of git://anongit.freedesktop.org/drm-intel into drm-next · aeb745e9
      Dave Airlie authored
      Here's the first drm-misc pull, with really mostly misc stuff all over.
      Somewhat invasive is only Ville's change to mark the arg struct for
      fb_create const - that might conflict with a new driver pull. So better to
      get in fast.
      
      * tag 'topic/drm-misc-2015-11-26' of git://anongit.freedesktop.org/drm-intel:
        drm/mm: use list_next_entry
        drm/i915: fix potential dangling else problems in for_each_ macros
        drm: fix potential dangling else problems in for_each_ macros
        drm/sysfs: Send out uevent when connector->force changes
        drm/atomic: Small documentation fix.
        drm/mm: rewrite drm_mm_for_each_hole
        drm/sysfs: Grab lock for edid/modes_show
        drm: Print the src/dst/clip rectangles in error in drm_plane_helper
        drm: Add "prefix" parameter to drm_rect_debug_print()
        drm: Keep coordinates in the typical x, y, w, h order instead of x, y, h, w
        drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()
        drm: modes: replace simple_strtoul by kstrtouint
        drm: Describe the Rotation property bits.
        drm: Remove unused fbdev_list members
        GPU-DRM: Delete unnecessary checks before drm_property_unreference_blob()
        drm/dp: add eDP DPCD backlight control bit definitions
        drm/tegra: Remove local fbdev emulation Kconfig option
        drm/imx: Remove local fbdev emulation Kconfig option
        drm/gem: Update/Polish docs
        drm: Update GEM refcounting docs
      aeb745e9
    • Jyri Sarha's avatar
      drm/atomic_helper: Add drm_atomic_helper_disable_planes_on_crtc() · 6753ba97
      Jyri Sarha authored
      Add drm_atomic_helper_disable_planes_on_crtc() for disabling all
      planes associated with the given CRTC. This can be used for instance
      in the CRTC helper disable callback to disable all planes before
      shutting down the display pipeline.
      
      v2:
      - Address Daniels review comments [1]
        - Do atomic_begin() and atomic_flush() always if they are defined and
          atomic knob is set
        - update kerneldoc
      - Put drm_atomic_helper_disable_planes_on_crtc() after
        drm_atomic_helper_commit_planes_on_crtc() in drm_atomic_helper.c
        to have functions in the same order as in drm_atomic_helper.h
      Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1448633641-6486-1-git-send-email-jsarha@ti.comSigned-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6753ba97
    • Linus Torvalds's avatar
      Linux 4.4-rc3 · 31ade3b8
      Linus Torvalds authored
      31ade3b8
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c5bc1c93
      Linus Torvalds authored
      Pull nouveau and radeon fixes from Dave Airlie:
       "Just some nouveau and radeon/amdgpu fixes.
      
        The nouveau fixes look large as the firmware context files are
        regenerated, but the actual change is quite small"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: make some dpm errors debug only
        drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set
        drm/nouveau/nvif: allow userspace access to its own client object
        drm/nouveau/gr/gf100-: fix oops when calling zbc methods
        drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero
        drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
        drm/nouveau/gr/gf100-: split out per-gpc address calculation macro
        drm/nouveau/bios: return actual size of the buffer retrieved via _ROM
        drm/nouveau/instmem: protect instobj list with a spinlock
        drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop
        drm/nouveau/pci: enable c800 magic for Clevo P157SM
        drm/radeon: make rv770_set_sw_state failures non-fatal
        drm/amdgpu: move dependency handling out of atomic section v2
        drm/amdgpu: optimize scheduler fence handling
        drm/amdgpu: remove vm->mutex
        drm/amdgpu: add mutex for ba_va->valids/invalids
        drm/amdgpu: adapt vce session create interface changes
        drm/amdgpu: vce use multiple cache surface starting from stoney
        drm/amdgpu: reset vce trap interrupt flag
      c5bc1c93
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 818aba30
      Linus Torvalds authored
      Pull RTC fixes from Alexandre Belloni:
       "Two fixes for the ds1307 alarm and wakeup"
      
      * tag 'rtc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
        rtc: ds1307: fix alarm reading at probe time
        rtc: ds1307: fix kernel splat due to wakeup irq handling
      818aba30
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 00fd6a71
      Linus Torvalds authored
      Pull MIPS fix from Ralf Baechle:
       "Just a fix for empty loops that may be removed by non-antique GCC"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Fix delay loops which may be removed by GCC.
      00fd6a71
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · d72aee78
      Linus Torvalds authored
      Pull m68k fixes from Geert Uytterhoeven:
       "Summary:
      
         - Add missing initialization of max_pfn, which is needed to make
           selftests/vm/mlock2-tests succeed,
      
         - Wire up new mlock2 syscall"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Wire up mlock2
        m68knommu: Add missing initialization of max_pfn and {min,max}_low_pfn
        m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn
        m68k/mm: m54xx - Add missing initialization of max_pfn
        m68k/mm: motorola - Add missing initialization of max_pfn
      d72aee78
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 04527fda
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Just two changes this time around:
      
         - wire up the new mlock2 syscall added during the last merge window
      
         - fix a build problem with certain configurations provoked by making
           CONFIG_OF user selectable"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8454/1: OF implies OF_FLATTREE
        ARM: wire up mlock2 syscall
      04527fda
  7. 29 Nov, 2015 12 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 36511e86
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       - fix tcm-user backend driver expired cmd time processing (agrover)
       - eliminate kref_put_spinlock_irqsave() for I/O completion (bart)
       - fix iscsi login kthread failure case hung task regression (nab)
       - fix COMPARE_AND_WRITE completion use-after-free race (nab)
       - fix COMPARE_AND_WRITE with SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC non zero
         SGL offset data corruption.  (Jan + Doug)
       - fix >= v4.4-rc1 regression for tcm_qla2xxx enable configfs attribute
         (Himanshu + HCH)
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target/stat: print full t10_wwn.model buffer
        target: fix COMPARE_AND_WRITE non zero SGL offset data corruption
        qla2xxx: Fix regression introduced by target configFS changes
        kref: Remove kref_put_spinlock_irqsave()
        target: Invoke release_cmd() callback without holding a spinlock
        target: Fix race for SCF_COMPARE_AND_WRITE_POST checking
        iscsi-target: Fix rx_login_comp hang after login failure
        iscsi-target: return -ENOMEM instead of -1 in case of failed kmalloc()
        target/user: Do not set unused fields in tcmu_ops
        target/user: Fix time calc in expired cmd processing
      36511e86
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 75a29ec1
      Linus Torvalds authored
      Pull thermal management fixes from Zhang Rui:
       "Specifics:
      
       - several fixes and cleanups on Rockchip thermal drivers.
      
       - add the missing support of RK3368 SoCs in Rockchip driver.
      
       - small fixes on of-thermal, power_allocator, rcar driver, IMX, and
         QCOM drivers, and also compilation fixes, on thermal.h, when thermal
         is not selected"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        imx: thermal: use CPU temperature grade info for thresholds
        thermal: fix thermal_zone_bind_cooling_device prototype
        Revert "thermal: qcom_spmi: allow compile test"
        thermal: rcar_thermal: remove redundant operation
        thermal: of-thermal: Reduce log level for message when can't fine thermal zone
        thermal: power_allocator: Use temperature reading from tz
        thermal: rockchip: Support the RK3368 SoCs in thermal driver
        thermal: rockchip: consistently use int for temperatures
        thermal: rockchip: Add the sort mode for adc value increment or decrement
        thermal: rockchip: improve the conversion function
        thermal: rockchip: trivial: fix typo in commit
        thermal: rockchip: better to compatible the driver for different SoCs
        dt-bindings: rockchip-thermal: Support the RK3368 SoCs compatible
      75a29ec1
    • David Disseldorp's avatar
      target/stat: print full t10_wwn.model buffer · 8f903539
      David Disseldorp authored
      Cut 'n paste error saw it only process sizeof(t10_wwn.vendor) characters.
      Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      8f903539
    • Jan Engelhardt's avatar
      target: fix COMPARE_AND_WRITE non zero SGL offset data corruption · d94e5a61
      Jan Engelhardt authored
      target_core_sbc's compare_and_write functionality suffers from taking
      data at the wrong memory location when writing a CAW request to disk
      when a SGL offset is non-zero.
      
      This can happen with loopback and vhost-scsi fabric drivers when
      SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is used to map existing user-space
      SGL memory into COMPARE_AND_WRITE READ/WRITE payload buffers.
      
      Given the following sample LIO subtopology,
      
      % targetcli ls /loopback/
      o- loopback ................................. [1 Target]
        o- naa.6001405ebb8df14a ....... [naa.60014059143ed2b3]
          o- luns ................................... [2 LUNs]
            o- lun0 ................ [iblock/ram0 (/dev/ram0)]
            o- lun1 ................ [iblock/ram1 (/dev/ram1)]
      % lsscsi -g
      [3:0:1:0]    disk    LIO-ORG  IBLOCK           4.0   /dev/sdc   /dev/sg3
      [3:0:1:1]    disk    LIO-ORG  IBLOCK           4.0   /dev/sdd   /dev/sg4
      
      the following bug can be observed in Linux 4.3 and 4.4~rc1:
      
      % perl -e 'print chr$_ for 0..255,reverse 0..255' >rand
      % perl -e 'print "\0" x 512' >zero
      % cat rand >/dev/sdd
      % sg_compare_and_write -i rand -D zero --lba 0 /dev/sdd
      % sg_compare_and_write -i zero -D rand --lba 0 /dev/sdd
      Miscompare reported
      % hexdump -Cn 512 /dev/sdd
      00000000  0f 0e 0d 0c 0b 0a 09 08  07 06 05 04 03 02 01 00
      00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
      *
      00000200
      
      Rather than writing all-zeroes as instructed with the -D file, it
      corrupts the data in the sector by splicing some of the original
      bytes in. The page of the first entry of cmd->t_data_sg includes the
      CDB, and sg->offset is set to a position past the CDB. I presume that
      sg->offset is also the right choice to use for subsequent sglist
      members.
      Signed-off-by: default avatarJan Engelhardt <jengelh@netitwork.de>
      Tested-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
      Cc: <stable@vger.kernel.org> # v3.12+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      d94e5a61
    • Himanshu Madhani's avatar
      qla2xxx: Fix regression introduced by target configFS changes · 3786dc45
      Himanshu Madhani authored
      this patch fixes following regression
      
       # targetcli
       [Errno 13] Permission denied: '/sys/kernel/config/target/qla2xxx/21:00:00:0e:1e:08:c7:20/tpgt_1/enable'
      
      Fixes: 2eafd729 ("target: use per-attribute show and store methods")
      Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
      Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      3786dc45
    • Bart Van Assche's avatar
      kref: Remove kref_put_spinlock_irqsave() · 3a66d7dc
      Bart Van Assche authored
      The last user is gone. Hence remove this function.
      Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Joern Engel <joern@logfs.org>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      3a66d7dc
    • Bart Van Assche's avatar
      target: Invoke release_cmd() callback without holding a spinlock · 9ff9d15e
      Bart Van Assche authored
      This patch fixes the following kernel warning because it avoids that
      IRQs are disabled while ft_release_cmd() is invoked (fc_seq_set_resp()
      invokes spin_unlock_bh()):
      
      WARNING: CPU: 3 PID: 117 at kernel/softirq.c:150 __local_bh_enable_ip+0xaa/0x110()
      Call Trace:
       [<ffffffff814f71eb>] dump_stack+0x4f/0x7b
       [<ffffffff8105e56a>] warn_slowpath_common+0x8a/0xc0
       [<ffffffff8105e65a>] warn_slowpath_null+0x1a/0x20
       [<ffffffff81062b2a>] __local_bh_enable_ip+0xaa/0x110
       [<ffffffff814ff229>] _raw_spin_unlock_bh+0x39/0x40
       [<ffffffffa03a7f94>] fc_seq_set_resp+0xe4/0x100 [libfc]
       [<ffffffffa02e604a>] ft_free_cmd+0x4a/0x90 [tcm_fc]
       [<ffffffffa02e6972>] ft_release_cmd+0x12/0x20 [tcm_fc]
       [<ffffffffa042bd66>] target_release_cmd_kref+0x56/0x90 [target_core_mod]
       [<ffffffffa042caf0>] target_put_sess_cmd+0xc0/0x110 [target_core_mod]
       [<ffffffffa042cb81>] transport_release_cmd+0x41/0x70 [target_core_mod]
       [<ffffffffa042d975>] transport_generic_free_cmd+0x35/0x420 [target_core_mod]
      Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
      Acked-by: default avatarJoern Engel <joern@logfs.org>
      Reviewed-by: default avatarAndy Grover <agrover@redhat.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Hannes Reinecke <hare@suse.de>
      Cc: Sagi Grimberg <sagig@mellanox.com>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      9ff9d15e
    • Nicholas Bellinger's avatar
      target: Fix race for SCF_COMPARE_AND_WRITE_POST checking · 057085e5
      Nicholas Bellinger authored
      This patch addresses a race + use after free where the first
      stage of COMPARE_AND_WRITE in compare_and_write_callback()
      is rescheduled after the backend sends the secondary WRITE,
      resulting in second stage compare_and_write_post() callback
      completing in target_complete_ok_work() before the first
      can return.
      
      Because current code depends on checking se_cmd->se_cmd_flags
      after return from se_cmd->transport_complete_callback(),
      this results in first stage having SCF_COMPARE_AND_WRITE_POST
      set, which incorrectly falls through into second stage CAW
      processing code, eventually triggering a NULL pointer
      dereference due to use after free.
      
      To address this bug, pass in a new *post_ret parameter into
      se_cmd->transport_complete_callback(), and depend upon this
      value instead of ->se_cmd_flags to determine when to return
      or fall through into ->queue_status() code for CAW.
      
      Cc: Sagi Grimberg <sagig@mellanox.com>
      Cc: <stable@vger.kernel.org> # v3.12+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      057085e5
    • Nicholas Bellinger's avatar
      iscsi-target: Fix rx_login_comp hang after login failure · ca82c2bd
      Nicholas Bellinger authored
      This patch addresses a case where iscsi_target_do_tx_login_io()
      fails sending the last login response PDU, after the RX/TX
      threads have already been started.
      
      The case centers around iscsi_target_rx_thread() not invoking
      allow_signal(SIGINT) before the send_sig(SIGINT, ...) occurs
      from the failure path, resulting in RX thread hanging
      indefinately on iscsi_conn->rx_login_comp.
      
      Note this bug is a regression introduced by:
      
        commit e5419865
        Author: Nicholas Bellinger <nab@linux-iscsi.org>
        Date:   Wed Jul 22 23:14:19 2015 -0700
      
            iscsi-target: Fix iscsit_start_kthreads failure OOPs
      
      To address this bug, complete ->rx_login_complete for good
      measure in the failure path, and immediately return from
      RX thread context if connection state did not actually reach
      full feature phase (TARG_CONN_STATE_LOGGED_IN).
      
      Cc: Sagi Grimberg <sagig@mellanox.com>
      Cc: <stable@vger.kernel.org> # v3.10+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      ca82c2bd
    • Luis de Bethencourt's avatar
      iscsi-target: return -ENOMEM instead of -1 in case of failed kmalloc() · 82a819e8
      Luis de Bethencourt authored
      Smatch complains about returning hard coded error codes, silence this
      warning.
      
      drivers/target/iscsi/iscsi_target_parameters.c:211
         iscsi_create_default_params() warn: returning -1 instead of -ENOMEM is sloppy
      Signed-off-by: default avatarLuis de Bethencourt <luisbg@osg.samsung.com>
      Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      82a819e8
    • Andy Grover's avatar
      target/user: Do not set unused fields in tcmu_ops · 6ba4bd29
      Andy Grover authored
      TCMU sets TRANSPORT_FLAG_PASSTHROUGH, so INQUIRY commands will not be
      emulated by LIO but passed up to userspace. Therefore TCMU should not
      set these, just like pscsi doesn't.
      Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      6ba4bd29
    • Andy Grover's avatar
      target/user: Fix time calc in expired cmd processing · 611e2267
      Andy Grover authored
      Reversed arguments meant that we were doing nothing for cmds whose deadline
      had passed.
      Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      611e2267
  8. 28 Nov, 2015 3 commits
    • Arnd Bergmann's avatar
      ARM: 8454/1: OF implies OF_FLATTREE · aa7d5f18
      Arnd Bergmann authored
      On the ARM architecture, individual platforms select CONFIG_USE_OF if they
      need it, but all device tree code is keyed off CONFIG_OF. When building
      a platform without DT support and manually enabling CONFIG_OF, we now
      get a number of build errors, e.g.
      
      arch/arm/kernel/devtree.c: In function 'setup_machine_fdt':
      arch/arm/kernel/devtree.c:215:19: error: implicit declaration of function 'early_init_dt_verify' [-Werror=implicit-function-declaration]
      
      We could now try to separate the use case of booting from DT vs. the
      case of using the dynamic implementation, but that seems more complicated
      than it can gain us.
      
      This simply changes the ARM Kconfig file to always enable OF_RESERVED_MEM
      and OF_EARLY_FLATTREE when CONFIG_OF is enabled. These options add a little
      extra code when we just want the dynamic OF implementation, but that seems
      like a rather obscure case, and this version solves all CONFIG_OF related
      randconfig regressions.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 0166dc11 ("of: make CONFIG_OF user selectable")
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      aa7d5f18
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.4-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 081f3698
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "Here are a few fixes I'd like to have in v4.4: a generic one for sysfs
        and three for HiSilicon and DesignWare host controllers.
      
        Summary:
      
        NUMA:
         - Prevent out of bounds access in numa_node override (Mathias Krause)
      
        HiSilicon host bridge driver:
         - Fix deferred probing (Arnd Bergmann)
      
        Synopsys DesignWare host bridge driver:
         - Remove incorrect io_base assignment (Stanimir Varbanov)
         - Move align_resource function pointer to pci_host_bridge structure
           (Gabriele Paoloni)"
      
      * tag 'pci-v4.4-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        ARM/PCI: Move align_resource function pointer to pci_host_bridge structure
        PCI: hisi: Fix deferred probing
        PCI: designware: Remove incorrect io_base assignment
        PCI: Prevent out of bounds access in numa_node override
      081f3698
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 8003a573
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
        Stable patches:
         - Fix a NFSv4 callback identifier leak that was also causing client
           crashes
         - Fix NFSv4 callback decoding issues when incoming requests are
           truncated
         - Don't declare the attribute cache valid when we call
           nfs_update_inode with an empty attribute structure.
         - Resend LAYOUTGET when there is a race that changes the seqid
      
        Bugfixes:
         - Fix a number of issues with the NFSv4.2 CLONE ioctl()
         - Properly set NFS v4.2 NFSDBG_FACILITY
         - NFSv4 referrals are broken; Cleanup FATTR4_WORD0_FS_LOCATIONS after
           decoding success
         - Use sliding delay when LAYOUTGET gets NFS4ERR_DELAY
         - Ensure that attrcache is revalidated after a SETATTR"
      
      * tag 'nfs-for-4.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs4: resend LAYOUTGET when there is a race that changes the seqid
        nfs: if we have no valid attrs, then don't declare the attribute cache valid
        nfs: ensure that attrcache is revalidated after a SETATTR
        nfs4: limit callback decoding to received bytes
        nfs4: start callback_ident at idr 1
        nfs: use sliding delay when LAYOUTGET gets NFS4ERR_DELAY
        NFS4: Cleanup FATTR4_WORD0_FS_LOCATIONS after decoding success
        NFS: Properly set NFS v4.2 NFSDBG_FACILITY
        nfs: reduce the amount of ifdefs for v4.2 in nfs4file.c
        nfs: use btrfs ioctl defintions for clone
        nfs: allow intra-file CLONE
        nfs: offer native ioctls even if CONFIG_COMPAT is set
        nfs: pass on count for CLONE operations
      8003a573
  9. 27 Nov, 2015 5 commits
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · d0bc387d
      Linus Torvalds authored
      Pull watchdog fixes from Wim Van Sebroeck:
       - a null pointer dereference fix for omap_wdt
       - some clock related fixes for pnx4008
       - an underflow fix in wdt_set_timeout() for w83977f_wdt
       - restart fix for tegra wdt
       - Kconfig change to support Freescale Layerscape platforms
       - fix for stopping the mtk_wdt watchdog
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog
        watchdog: Add support for Freescale Layerscape platforms
        watchdog: tegra: Stop watchdog first if restarting
        watchdog: w83977f_wdt: underflow in wdt_set_timeout()
        watchdog: pnx4008: make global wdt_clk static
        watchdog: pnx4008: fix warnings caused by enabling unprepared clock
        watchdog: omap_wdt: fix null pointer dereference
      d0bc387d
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 80e0c505
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "This has Mark Fasheh's patches to fix quota accounting during subvol
        deletion, which we've been working on for a while now.  The patch is
        pretty small but it's a key fix.
      
        Otherwise it's a random assortment"
      
      * 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: fix balance range usage filters in 4.4-rc
        btrfs: qgroup: account shared subtree during snapshot delete
        Btrfs: use btrfs_get_fs_root in resolve_indirect_ref
        btrfs: qgroup: fix quota disable during rescan
        Btrfs: fix race between cleaner kthread and space cache writeout
        Btrfs: fix scrub preventing unused block groups from being deleted
        Btrfs: fix race between scrub and block group deletion
        btrfs: fix rcu warning during device replace
        btrfs: Continue replace when set_block_ro failed
        btrfs: fix clashing number of the enhanced balance usage filter
        Btrfs: fix the number of transaction units needed to remove a block group
        Btrfs: use global reserve when deleting unused block group after ENOSPC
        Btrfs: tests: checking for NULL instead of IS_ERR()
        btrfs: fix signed overflows in btrfs_sync_file
      80e0c505
    • Linus Torvalds's avatar
      Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 7e4b9359
      Linus Torvalds authored
      Pull security layer fixes from James Morris:
       "A fix for SELinux policy processing (regression introduced by
        commit fa1aa143: "selinux: extended permissions for ioctls"), as
        well as a fix for the user-triggerable oops in the Keys code"
      
      * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: Fix handling of stored error in a negatively instantiated user key
        selinux: fix bug in conditional rules handling
      7e4b9359
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c64410f3
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "There is a small backlog of at91 patches here, the most significant is
        the addition of some sama5d2 Xplained nodes that were waiting on an
        MFD include file to get merged through another tree.
      
        We normally try to sort those out before the merge window opens, but
        the maintainer wasn't aware of that here and I decided to merge the
        changes this time as an exception.
      
        On OMAP a series of audio changes for dra7 missed the merge window but
        turned out to be necessary to fix a boot time imprecise external abort
        error and to get audio working.
      
        The other changes are the usual simple changes, here is a list sorted
        by platform:
      
        at91:
      	removal of a useless defconfig option
      	removal of some legacy DT pieces
      	use of the proper watchdog compatible string
      	update of the MAINTAINERS entries for some Atmel drivers
      
        drivers/scpi:
      	hide get_scpi_ops in module from built-in code
      
        imx:
      	add missing .irq_set_type for i.MX GPC irq_chip.
      	fix the wrong spi-num-chipselects settings for Vybrid DSPI devices.
      	fix a merge error in Vybrid dts regarding to ADC device property
      
        keystone:
              fix the optional PDSP firmware loading
              fix linking RAM setup for QMs
              fix crash with clk_ignore_unused
      
        mediatek:
      	Enable SCPSYS power domain driver by default
      
        mvebu:
      	fix QNAP TS219 power-off in dts
      	fix legacy get_irqnr_and_base for dove and orion5x
      
        omap:
      	fix l4 related boot time errors for dm81xx
      	use lockless cldm/pwrdm api in omap4_boot_secondary
      	remove t410 abort handler to avoid hiding other critical errors
      	mark cpuidle tracepoints as _rcuidle
      	fix module alias for omap-ocp2scp
      
        pxa:
      	palm: Fix typos in PWM lookup table code
      
        renesas:
      	missing __initconst annotation for r8a7793_boards_compat_dt
      
        rockchip:
      	disable mmc-tuning on the veyron-minnie board
      	adding the init state for the over-temperature-protection
      
        zx:
      	only build power domain code when CONFIG_PM=y"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
        ARM: OMAP4+: SMP: use lockless clkdm/pwrdm api in omap4_boot_secondary
        arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data
        ARM: orion5x: Fix legacy get_irqnr_and_base
        ARM: dove: Fix legacy get_irqnr_and_base
        soc: Mediatek: Enable SCPSYS power domain driver by default
        ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects.
        ARM: dts: keystone: k2l: fix kernel crash when clk_ignore_unused is not in bootargs
        soc: ti: knav_qmss_queue: Fix linking RAM setup for queue managers
        soc: ti: use request_firmware_direct() as acc firmware is optional
        ARM: imx: add platform irq type setting in gpc
        ARM: dts: vfxxx: Fix erroneous property in esdhc0 node
        ARM: shmobile: r8a7793: proper constness with __initconst
        scpi: hide get_scpi_ops in module from built-in code
        ARM: zx: only build power domain code when CONFIG_PM=y
        ARM: pxa: palm: Fix typos in PWM lookup table code
        ARM: dts: Kirkwood: Fix QNAP TS219 power-off
        ARM: dts: rockchip: Add OTP gpio pinctrl to rk3288 tsadc node
        ARM: dts: rockchip: temporarily remove emmc hs200 speed from rk3288 minnie
        MAINTAINERS: Atmel drivers: change NAND and ISI entries
        ARM: at91/dt: sama5d2 Xplained: add several devices
        ...
      c64410f3
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a3b11c79
      Linus Torvalds authored
      Pull more power management and ACPI fixes from Rafael Wysocki:
       "These fix one recent regression (cpufreq core), fix up two features
        added recently (ACPI CPPC support, SCPI support in the arm_big_little
        cpufreq driver) and fix three older bugs in the intel_pstate driver.
      
        Specifics:
      
         - Fix a recent regression in the cpufreq core causing it to fail to
           clean up sysfs directories properly on cpufreq driver removal
           (Viresh Kumar).
      
         - Fix a build problem in the SCPI support code recently added to the
           arm_big_little cpufreq driver (Punit Agrawal).
      
         - Fix up the recently added CPPC cpufreq frontend to process the CPU
           coordination information provided by the platform firmware
           correctly (Ashwin Chaugule).
      
         - Fix the intel_pstate driver to behave as intended when switched
           over to the "performance" mode via sysfs if hardware-driven P-state
           selection (HWP) is enabled (Alexandra Yates).
      
         - Fix two rounding errors in the intel_pstate driver that sometimes
           cause it to use lower P-states than requested (Prarit Bhargava)"
      
      * tag 'pm+acpi-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        intel_pstate: Fix "performance" mode behavior with HWP enabled
        cpufreq: SCPI: Depend on SCPI clk driver
        cpufreq: intel_pstate: Fix limits->max_perf rounding error
        cpufreq: intel_pstate: Fix limits->max_policy_pct rounding error
        cpufreq: Always remove sysfs cpuX/cpufreq link on ->remove_dev()
        cpufreq: CPPC: Initialize and check CPUFreq CPU co-ord type correctly
      a3b11c79