- 07 Jan, 2015 18 commits
-
-
Russell King authored
We do not need to track the state of the IPU DI's clock flags by having each display bridge calling back into imx-drm-core, and then back out into ipuv3-crtc.c. ipuv3-crtc can instead just scan the list of encoders to retrieve their type, and build up a picture of which types of encoders are attached. We can then use this information to configure the IPU DI clocking mode without any uncertainty - if we have multiple bridges connected to the same DI, if one of them requires a synchronous DI clock, that's what we must use. Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
We can use the DIV_ROUND_CLOSEST() macro when calculating the DI clock divider, rounded to nearest int. Suggested-by:
Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
This patch changes struct ipu_di_signal_cfg to use struct videomode to define video timings and flags. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
The encoder ->prepare() and ->mode_set() methods need to use the hw adjusted mode, not the original mode. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
Ask the IPU display interface, via ipu_di_adjust_videomode(), to adjust a video mode to meet any DI restrictions. The function takes a subsystem independent videomode, so the drm_display_mode must be converted to videomode first, and then the adjusted mode converted back to a drm_display_mode. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
Add conversion from drm_display_mode to videomode. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
h_total and v_total were calculated in ipu_di_init_sync_panel() but never actually used. Remove. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Jiada Wang authored
On some monitors, high resolution modes are not working, exhibiting pixel column truncation problems (for example, 1280x1024 displays as 1280x1022). The function ipu_di_adjust_videomode() aims to fix these issues by adjusting a passed videomode to IPU restrictions. The function can be called from the drm_crtc_helper_funcs->mode_fixup() methods. Signed-off-by:
Jiada Wang <jiada_wang@mentor.com> Signed-off-by:
Deepak Das <deepak_das@mentor.com> Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Philipp Zabel authored
To build the rockchip dw_hdmi driver as a module, the rockchip_drm_encoder_get_mux_id and rockchip_drm_crtc_mode_config functions need to be exported. Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Philipp Zabel authored
Otherwise a spurious interrupt might trigger (and crash) the interrupt handler before probing finished. Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
Rockchip RK3288 hdmi is compatible with dw_hdmi Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
RK3288 HDMI will not work without the spare bit of HDMI_PHY_CONF0 enable Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
HDMI_IH_I2CMPHY_STAT0 is a clear on write register, which indicates i2cm operation status(i2c transfer done or error), every hdmi phy register configuration must check this register to make sure the configuration has complete. But the indication bit should be cleared after check, otherwise the corresponding bit will hold on forever, this may give a wrong signal for next check. Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
some platform may not support all the display mode, add mode_valid interface check it Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
On rockchip rk3288, only word(32-bit) accesses are permitted for hdmi registers. Byte width accesses (writeb, readb) generate an imprecise external abort. Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
the original imx hdmi driver is under drm/imx/, which depends on imx-drm, so move the imx hdmi driver out to drm/bridge and rename it to dw_hdmi Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
- 06 Jan, 2015 8 commits
-
-
Andy Yan authored
hdmi phy configuration is platform specific, which can be adjusted according to the board to get the best SI Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
IMX6 and Rockchip RK3288 and JZ4780 (Ingenic Xburst/MIPS) use the interface compatible Designware HDMI IP, but they also have some lightly differences, such as phy pll configuration, register width, 4K support, clk useage, and the crtc mux configuration is also platform specific. To reuse the imx hdmi driver, convert it to drm_bridge handle encoder in imx-hdmi_pltfm.c, as most of the encoder operation are platform specific such as crtc select and panel format set This patch depends on Russell King's patch: drm: imx: convert imx-drm to use the generic DRM OF helper http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-July/053484.htmlSigned-off-by:
Andy Yan <andy.yan@rock-chips.com> Signed-off-by:
Yakir Yang <ykk@rock-chips.com> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
drm driver may probe before the i2c bus, so the driver should defer probing until it is available Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Reviewed-by:
Daniel Kurtz <djkurtz@chromium.org> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Andy Yan authored
CHECK: Alignment should match open parenthesis + if ((hdmi->vic == 10) || (hdmi->vic == 11) || + (hdmi->vic == 12) || (hdmi->vic == 13) || CHECK: braces {} should be used on all arms of this statement + if (hdmi->hdmi_data.video_mode.mdvi) [...] + else { [...] Signed-off-by:
Andy Yan <andy.yan@rock-chips.com> Reviewed-by:
Daniel Kurtz <djkurtz@chromium.org> Tested-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Steve Longerbeam authored
The functions ipu_dc_enable() and ipu_dc_disable() enable/disable the DC globally in the IPU_CONF register, but the DC is used by multiple clients on different DC channels. So make sure to only disable/enable the DC globally based on a use counter. Signed-off-by:
Steve Longerbeam <steve_longerbeam@mentor.com> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Russell King authored
Use the generic DRM OF helper to locate the possible CRTCs for the encoder, thereby shrinking the imx-drm driver some more. Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Peter Seiderer authored
If edid was allocated during bind, it must be freed again during unbind. Signed-off-by:
Peter Seiderer <ps.report@gmx.net> Acked-by:
Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
Peter Seiderer authored
If edid was allocated during bind, it must be freed again during unbind. Signed-off-by:
Peter Seiderer <ps.report@gmx.net> Acked-by:
Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by:
Philipp Zabel <p.zabel@pengutronix.de>
-
- 21 Dec, 2014 3 commits
-
-
Linus Torvalds authored
-
git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linuxLinus Torvalds authored
Pull ACCESS_ONCE cleanup preparation from Christian Borntraeger: "kernel: Provide READ_ONCE and ASSIGN_ONCE As discussed on LKML http://marc.info/?i=54611D86.4040306%40de.ibm.com ACCESS_ONCE might fail with specific compilers for non-scalar accesses. Here is a set of patches to tackle that problem. The first patch introduce READ_ONCE and ASSIGN_ONCE. If the data structure is larger than the machine word size memcpy is used and a warning is emitted. The next patches fix up several in-tree users of ACCESS_ONCE on non-scalar types. This does not yet contain a patch that forces ACCESS_ONCE to work only on scalar types. This is targetted for the next merge window as Linux next already contains new offenders regarding ACCESS_ONCE vs. non-scalar types" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux: s390/kvm: REPLACE barrier fixup with READ_ONCE arm/spinlock: Replace ACCESS_ONCE with READ_ONCE arm64/spinlock: Replace ACCESS_ONCE READ_ONCE mips/gup: Replace ACCESS_ONCE with READ_ONCE x86/gup: Replace ACCESS_ONCE with READ_ONCE x86/spinlock: Replace ACCESS_ONCE with READ_ONCE mm: replace ACCESS_ONCE with READ_ONCE or barriers kernel: Provide READ_ONCE and ASSIGN_ONCE
-
git://git.linaro.org/people/mike.turquette/linuxLinus Torvalds authored
Pull clk framework updates from Mike Turquette: "This is much later than usual due to several last minute bugs that had to be addressed. As usual the majority of changes are new drivers and modifications to existing drivers. The core recieved many fixes along with the groundwork for several large changes coming in the future which will better parition clock providers from clock consumers" * tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux: (86 commits) clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated ARM: OMAP3: clock: fix boot breakage in legacy mode ARM: OMAP2+: clock: fix DPLL code to use new determine rate APIs clk: Really fix deadlock with mmap_sem clk: mmp: fix sparse non static symbol warning clk: Change clk_ops->determine_rate to return a clk_hw as the best parent clk: change clk_debugfs_add_file to take a struct clk_hw clk: Don't expose __clk_get_accuracy clk: Don't try to use a struct clk* after it could have been freed clk: Remove unused function __clk_get_prepare_count clk: samsung: Fix double add of syscore ops after driver rebind clk: samsung: exynos4: set parent of sclk_hdmiphy to hdmi clk: samsung: exynos4415: Fix build with PM_SLEEP disabled clk: samsung: remove unnecessary inclusion of header files from clk.h clk: samsung: remove unnecessary CONFIG_OF from clk.c clk: samsung: Spelling s/bwtween/between/ clk: rockchip: Add support for the mmc clock phases using the framework clk: rockchip: add bindings for the mmc clocks clk: rockchip: rk3288 export i2s0_clkout for use in DT clk: rockchip: use clock ID for DMC (memory controller) on rk3288 ...
-
- 20 Dec, 2014 11 commits
-
-
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linuxLinus Torvalds authored
Pull more i2c updates from Wolfram Sang: "Included are two bugfixes needing some bigger refactoring (sh_mobile: deferred probe with DMA, mv64xxx: fix offload support) and one deprecated driver removal I thought would go in via ppc but I misunderstood. It has a proper ack from BenH" * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: sh_mobile: fix uninitialized var when debug is enabled macintosh: therm_pm72: delete deprecated driver i2c: sh_mobile: I2C_SH_MOBILE should depend on HAS_DMA i2c: sh_mobile: rework deferred probing i2c: sh_mobile: refactor DMA setup i2c: mv64xxx: rework offload support to fix several problems i2c: mv64xxx: use BIT() macro for register value definitions
-
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsiLinus Torvalds authored
Pull SCSI update from James Bottomley: "This is a much shorter set of patches that were on the go but didn't make it in to the early pull request for the merge window. It's really a set of bug fixes plus some final cleanup work on the new tag queue API" * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: storvsc: ring buffer failures may result in I/O freeze ipr: set scsi_level correctly for disk arrays ipr: add support for async scanning to speed up boot scsi_debug: fix missing "break;" in SDEBUG_UA_CAPACITY_CHANGED case scsi_debug: take sdebug_host_list_lock when changing capacity scsi_debug: improve driver description in Kconfig scsi_debug: fix compare and write errors qla2xxx: fix race in handling rport deletion during recovery causes panic scsi: blacklist RSOC for Microsoft iSCSI target devices scsi: fix random memory corruption with scsi-mq + T10 PI Revert "[SCSI] mpt3sas: Remove phys on topology change" Revert "[SCSI] mpt2sas: Remove phys on topology change." esas2r: Correct typos of "validate" in a comment fc: FCP_PTA_SIMPLE is 0 ibmvfc: remove unused tag variable scsi: remove MSG_*_TAG defines scsi: remove scsi_set_tag_type scsi: remove scsi_get_tag_type scsi: never drop to untagged mode during queue ramp down scsi: remove ->change_queue_type method
-
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pmLinus Torvalds authored
Pull CONFIG_PM_RUNTIME elimination from Rafael Wysocki: "This removes the last few uses of CONFIG_PM_RUNTIME introduced recently and makes that config option finally go away. CONFIG_PM will be available directly from the menu now and also it will be selected automatically if CONFIG_SUSPEND or CONFIG_HIBERNATION is set" * tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: Eliminate CONFIG_PM_RUNTIME tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
-
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuildLinus Torvalds authored
Pull misc kbuild changes from Michal Marek: "There are only a few things in the misc branch: - Fix for bugon.cocci semantic patch - Kdevelop4 files are .gitignored - Put make binrpm-pkg on diet" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scripts/package: binrpm-pkg do not create source and devel package .gitignore: Add Kdevelop4 project files bugon.cocci: fix Options at the macro
-
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuildLinus Torvalds authored
Pull kbuild updates from Michal Marek: "Here are the kbuild changes for v3.19-rc1: - Cleanups and deduplication in the main Makefile and scripts/Makefile.* - Sort the output of *config targets in make help - Old <linux/version.h> is always removed to avoid a surprise during bisecting - Warning fix in kconfig" * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: remove redundant -rR flag of hdr-inst kbuild: Fix make help-<board series> on powerpc kbuild: Automatically remove stale <linux/version.h> file kconfig: Fix warning "‘jump’ may be used uninitialized" Makefile: sort list of defconfig targets in make help output kbuild: Remove duplicate $(cmd) definition in Makefile.clean kbuild: collect shorthands into scripts/Kbuild.include
-
Wolfram Sang authored
Signed-off-by:
Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by:
Wolfram Sang <wsa@the-dreams.de>
-
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsLinus Torvalds authored
Pull vfs pile #3 from Al Viro: "Assorted fixes and patches from the last cycle" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: [regression] chunk lost from bd9b51 vfs: make mounts and mountstats honor root dir like mountinfo does vfs: cleanup show_mountinfo init: fix read-write root mount unfuck binfmt_misc.c (broken by commit e6084d4a) vm_area_operations: kill ->migrate() new helper: iter_is_iovec() move_extent_per_page(): get rid of unused w_flags lustre: get rid of playing with ->fs btrfs: filp_open() returns ERR_PTR() on failure, not NULL...
-
Linus Torvalds authored
Merge tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs Pull eCryptfs fixes from Tyler Hicks: "Fixes for filename decryption and encrypted view plus a cleanup - The filename decryption routines were, at times, writing a zero byte one character past the end of the filename buffer - The encrypted view feature attempted, and failed, to roll its own form of enforcing a read-only mount instead of letting the VFS enforce it" * tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs: eCryptfs: Remove buggy and unnecessary write in file name decode routine eCryptfs: Remove unnecessary casts when parsing packet lengths eCryptfs: Force RO mount when encrypted view is enabled
-
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfsLinus Torvalds authored
Pull more btrfs updates from Chris Mason: "This is part two of our merge window patches. These are all from Filipe, and fix some really hard to find races that can cause corruptions. Most of them involved block group removal (balance) or discard" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: remove non-sense btrfs_error_discard_extent() function Btrfs: fix fs corruption on transaction abort if device supports discard Btrfs: always clear a block group node when removing it from the tree Btrfs: ensure deletion from pinned_chunks list is protected
-
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/soundLinus Torvalds authored
Pull sound fixes from Takashi Iwai: "Here are a few fixes that have landed after the previous pull request. All are driver specific fixes including: - error/int value fixes in OXFW, - Intel Skylake HD-audio HDMI codec support, - Additional HD-audio Realtek codecs and AD1986A codec fixes/quirks, - a few more DSD support and a quirk for Arcam rPAC in usb-audio, - a typo fix for Scarlett 6i6, - fixes for new ASIHPI firmware, - ASoC Exynos7 cleanups, - Intel ACPI support, and - a fix for PCM512 register cache sync" * tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits) ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC ALSA: hda/realtek - New codec support for ALC298 ALSA: asihpi: update to HPI version 4.14 ALSA: asihpi: increase tuner pad cache size ALSA: asihpi: relax firmware version check ALSA: usb-audio: Fix Scarlett 6i6 initialization typo ALSA: hda - Add quirk for Packard Bell EasyNote MX65 ALSA: usb-audio: add native DSD support for Matrix Audio DACs ALSA: hda/realtek - New codec support for ALC256 ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode ASoC: Intel: fix possible acpi enumeration panic ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec ASoC: Intel: fix return value check in sst_acpi_probe() ALSA: hda - Make add_stereo_mix_input flag tristate ALSA: hda - Create capture source ctls when stereo mix input is added ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments ALSA: hda - add codec ID for Skylake display audio codec ALSA: oxfw: some signedness bugs ALSA: oxfw: fix detect_loud_models() return value ASoC: rt5677: add REGMAP_I2C and REGMAP_IRQ dependency ...
-
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds authored
Pull SCSI target fixes from Nicholas Bellinger: "The highlights this merge window include: - Allow target fabric drivers to function as built-in. (Roland) - Fix tcm_loop multi-TPG endpoint nexus bug. (Hannes) - Move per device config_item_type into se_subsystem_api, allowing configfs attributes to be defined at module_init time. (Jerome + nab) - Convert existing IBLOCK/FILEIO/RAMDISK/PSCSI/TCMU drivers to use external configfs attributes. (nab) - A number of iser-target fixes related to active session + network portal shutdown stability during extended stress testing. (Sagi + Slava) - Dynamic allocation of T10-PI contexts for iser-target, fixing a potentially bogus iscsi_np->tpg_np pointer reference in >= v3.14 code. (Sagi) - iser-target performance + scalability improvements. (Sagi) - Fixes for SPC-4 Persistent Reservation AllRegistrants spec compliance. (Ilias + James + nab) - Avoid potential short kern_sendmsg() in iscsi-target for now until Al's conversion to use msghdr iteration is merged post -rc1. (Viro) Also, Sagi has requested a number of iser-target patches (9) that address stability issues he's encountered during extended stress testing be considered for v3.10.y + v3.14.y code. Given the amount of LOC involved, it will certainly require extra backporting effort. Apologies in advance to Greg-KH & Co on this. Sagi and I will be working post-merge to ensure they each get applied correctly" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (53 commits) target: Allow AllRegistrants to re-RESERVE existing reservation uapi/linux/target_core_user.h: fix headers_install.sh badness iscsi-target: Fail connection on short sendmsg writes iscsi-target: nullify session in failed login sequence target: Avoid dropping AllRegistrants reservation during unregister target: Fix R_HOLDER bit usage for AllRegistrants iscsi-target: Drop left-over bogus iscsi_np->tpg_np iser-target: Fix wc->wr_id cast warning iser-target: Remove code duplication iser-target: Adjust log levels and prettify some prints iser-target: Use debug_level parameter to control logging level iser-target: Fix logout sequence iser-target: Don't wait for session commands from completion context iser-target: Reduce CQ lock contention by batch polling iser-target: Introduce isert_poll_budget iser-target: Remove an atomic operation from the IO path iser-target: Remove redundant call to isert_conn_terminate iser-target: Use single CQ for TX and RX iser-target: Centralize completion elements to a context iser-target: Cast wr_id with uintptr_t instead of unsinged long ...
-