aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
AgeCommit message (Expand)AuthorFilesLines
2015-03-28Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2-7/+3
2015-03-27watchdog: imgpdc: Fix default heartbeatJames Hogan1-3/+3
2015-03-27watchdog: imgpdc: Fix probe NULL pointer dereferenceJames Hogan1-1/+1
2015-03-27watchdog: mtk_wdt: signedness bug in mtk_wdt_start()Dan Carpenter1-1/+1
2015-03-26Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds3-34/+35
2015-03-26Merge tag 'dm-4.0-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dev...Linus Torvalds1-10/+16
2015-03-26drm/i915: Fixup legacy plane->crtc link for initial fb configDaniel Vetter1-0/+2
2015-03-26drm/i915: Fix atomic state when reusing the firmware fbDamien Lespiau1-2/+9
2015-03-26clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()Maxime Ripard1-7/+0
2015-03-26clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errorsRichard Weinberger1-0/+3
2015-03-26drm/i915: Keep ring->active_list and ring->requests_list consistentChris Wilson1-17/+21
2015-03-25Merge branch 'akpm' (patches from Andrew)Linus Torvalds1-8/+9
2015-03-25drivers/rtc/rtc-mrst: fix suspend/resumeLars-Peter Clausen1-8/+9
2015-03-25Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds2-4/+5
2015-03-24Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds3-4/+6
2015-03-24Merge tag 'mfd-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/le...Linus Torvalds2-7/+25
2015-03-25drm/i915: Don't try to reference the fb in get_initial_plane_config()Damien Lespiau1-4/+3
2015-03-24Merge tag 'spi-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/bro...Linus Torvalds3-8/+12
2015-03-24Merge tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds1-0/+4
2015-03-24Merge tag 'regmap-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds3-26/+30
2015-03-24Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/queue' and 'spi/fix/qup...Mark Brown3-8/+12
2015-03-24drm: Fixup racy refcounting in plane_force_disableDaniel Vetter1-12/+1
2015-03-23dm: fix add_disk() NULL pointer due to race with free_dev()Mike Snitzer1-10/+16
2015-03-23Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas'...Mark Brown1-0/+4
2015-03-23Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds6-52/+161
2015-03-23NVMe: Initialize device list head before startingKeith Busch1-0/+1
2015-03-22Merge tag 'md/4.0-rc4-fix' of git://neil.brown.name/mdLinus Torvalds2-3/+2
2015-03-22Merge tag 'char-misc-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds3-183/+3
2015-03-22Merge tag 'staging-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds3-17/+17
2015-03-22Merge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds1-3/+12
2015-03-22Merge tag 'usb-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds33-719/+124
2015-03-21cx82310_eth: wait for firmware to become readyOndrej Zary1-6/+24
2015-03-21Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds5-80/+137
2015-03-21Merge tag 'pm+acpi-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds4-23/+54
2015-03-21Merge git://people.freedesktop.org/~airlied/linuxLinus Torvalds18-372/+159
2015-03-21Merge tag 'devicetree-fixes-for-4.0-part2' of git://git.kernel.org/pub/scm/li...Linus Torvalds3-12/+14
2015-03-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds13-47/+60
2015-03-21Merge tag 'dm-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dev...Linus Torvalds4-26/+141
2015-03-21Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifsLinus Torvalds1-1/+2
2015-03-21Merge branches 'pm-cpuidle', 'powercap', 'irq-pm' and 'acpi-resources'Rafael J. Wysocki93-889/+1272
2015-03-21md: fix problems with freeing private data after ->run failure.NeilBrown2-3/+2
2015-03-20be2net: use PCI MMIO read instead of config read for errorsSuresh Reddy2-11/+23
2015-03-20be2net: restrict MODIFY_EQ_DELAY cmd to a max of 8 EQsSuresh Reddy1-9/+5
2015-03-20be2net: Prevent VFs from enabling VLAN promiscuous modeVasundhara Volam4-24/+80
2015-03-20net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5}Markos Chandras1-2/+29
2015-03-20Revert "x86/PCI: Refine the way to release PCI IRQ resources"Rafael J. Wysocki1-1/+8
2015-03-20Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-i...Dave Airlie1-4/+28
2015-03-20Merge tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabb...Dave Airlie3-11/+23
2015-03-19target: do not reject FUA CDBs when write cache is enabled but emulate_write_...Christophe Vu-Brugier3-18/+16
2015-03-19target: Fix virtual LUN=0 target_configure_device failure OOPsNicholas Bellinger1-2/+2
2015-03-19target/pscsi: Fix NULL pointer dereference in get_device_typeNicholas Bellinger1-1/+1
2015-03-19tcm_fc: missing curly braces in ft_invl_hw_context()Dan Carpenter1-1/+2
2015-03-19target: Fix reference leak in target_get_sess_cmd() error pathBart Van Assche1-0/+4
2015-03-19loop/usb/vhost-scsi/xen-scsiback: Fix use of __transport_register_sessionBart Van Assche4-16/+8
2015-03-19tcm_qla2xxx: Fix incorrect use of __transport_register_sessionBart Van Assche1-1/+1
2015-03-19iscsi-target: Avoid early conn_logout_comp for iser connectionsNicholas Bellinger1-4/+10
2015-03-19Revert "iscsi-target: Avoid IN_LOGOUT failure case for iser-target"Nicholas Bellinger1-3/+1
2015-03-19target: Disallow changing of WRITE cache/FUA attrs after exportNicholas Bellinger1-1/+15
2015-03-19Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2-55/+185
2015-03-19Merge tag 'mmc-v4.0-rc4' of git://git.linaro.org/people/ulf.hansson/mmcLinus Torvalds1-1/+1
2015-03-19Merge tag 'pinctrl-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/l...Linus Torvalds6-78/+213
2015-03-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ideLinus Torvalds1-2/+2
2015-03-19regmap: introduce regmap_name to fix syscon regmap trace eventsPhilipp Zabel3-26/+30
2015-03-19Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds32-149/+241
2015-03-19ata: Add a new flag to destinguish sas controllerShaohua Li3-4/+6
2015-03-19Revert "of: Fix premature bootconsole disable with 'stdout-path'"Peter Hurley1-3/+1
2015-03-19of: handle both '/' and ':' in path stringsBrian Norris1-6/+1
2015-03-19of: unittest: Add option string test case with longer pathBrian Norris1-0/+5
2015-03-19of/irq: Fix of_irq_parse_one() returned error codesLaurent Pinchart1-3/+7
2015-03-19mmc: pwrseq_simple: fix error path in mmc_pwrseq_simple_allocNeilBrown1-1/+1
2015-03-19Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux int...Dave Airlie1-11/+0
2015-03-19Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/...Dave Airlie6-287/+15
2015-03-18ide_tape: convert jiffies with jiffies_to_msecsNicholas Mc Guire1-2/+2
2015-03-18Revert "net: cx82310_eth: use common match macro"Ondrej Zary1-1/+10
2015-03-18net/mlx4_en: Set statistics bitmap at port initEran Ben Elisha1-2/+2
2015-03-18IB/mlx4: Saturate RoCE port PMA counters in case of overflowMajd Dibbiny1-4/+16
2015-03-18net/mlx4_en: Fix off-by-one in ethtool statistics displayEran Ben Elisha1-1/+1
2015-03-18IB/mlx4: Verify net device validity on port change eventMoni Shoua1-1/+5
2015-03-18Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds5-33/+56
2015-03-18dmaengine: pl08x: Define capabilities for generic capabilities reportingMark Brown1-0/+14
2015-03-18usb: common: otg-fsm: only signal connect after switching to peripheralPeter Chen1-2/+2
2015-03-18uas: Add US_FL_NO_ATA_1X for Initio Corporation controllers / devicesHans de Goede1-0/+7
2015-03-18drm/radeon: drop ttm two ended allocationAlex Deucher1-11/+0
2015-03-18USB: ehci-atmel: rework clk handlingBoris Brezillon1-21/+9
2015-03-18drm/exynos: fix the initialization order in FIMDHyungwon Hwang1-18/+11
2015-03-18drm/exynos: fix typo config name correctly.Inki Dae1-1/+1
2015-03-18drm/exynos: Check for NULL dereference of crtcCharles Keepax1-1/+1
2015-03-18drm/exynos: IS_ERR() vs NULL bugDan Carpenter1-2/+2
2015-03-18drm/exynos: remove unused filesAndrzej Hajda2-265/+0
2015-03-18spi: trigger trace event for message-done before mesg->completeUwe Kleine-König1-2/+3
2015-03-18pinctrl: sun4i: GPIOs configured as irq must be set to input before readingHans de Goede3-2/+17
2015-03-18drm/i915: Make sure the primary plane is enabled before reading out the fb stateDamien Lespiau1-4/+11
2015-03-18pinctrl: at91: move lock/unlock_as_irq calls into request/releaseBoris Brezillon1-10/+7
2015-03-18rtc: at91rm9200: double locking bug in at91_rtc_interrupt()Dan Carpenter1-1/+1
2015-03-17Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git:/...Linus Torvalds2-6/+6
2015-03-17HID: wacom: check for wacom->shared before following the pointerBenjamin Tissoires1-3/+4
2015-03-17Revert "smc91x: retrieve IRQ and trigger flags in a modern way"Robert Jarzmik1-12/+8
2015-03-17Merge tag 'regulator-fix-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2-17/+18
2015-03-17Merge tag 'regmap-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds3-4/+7
2015-03-17Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds4-15/+132
2015-03-17regulator: palmas: Correct TPS659038 register definition for REGEN2Keerthy1-0/+4
2015-03-17virtio_mmio: fix access width for mmioMichael S. Tsirkin1-8/+71
2015-03-17Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2...Dave Airlie7-59/+93
2015-03-17drm/nouveau/bios: fix i2c table parsing for dcb 4.1Stefan Huehner1-1/+5
2015-03-17drm/nouveau/device/gm100: Basic GM206 bring up (as copy of GM204)Stefan Huehner1-0/+43
2015-03-17drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switchBen Skeggs1-2/+4
2015-03-17drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addressesBen Skeggs3-6/+6
2015-03-17drm/nouveau/fifo/nv04: remove the loop from the interrupt handlerBen Skeggs1-50/+35
2015-03-16drm/radeon: Changing number of compute pipe linesBen Goz1-1/+1
2015-03-16drm/amdkfd: Fix SDMA queue init. in non-HWS modeBen Goz1-1/+9
2015-03-16drm/amdkfd: destroy mqd when destroying kernel queueBen Goz1-9/+13
2015-03-16bnx2x: fix encapsulation features on 57710/57711Michal Schmidt1-1/+1
2015-03-16dmaengine: dw: append MODULE_ALIAS for platform driverAndy Shevchenko1-1/+4
2015-03-16Revert "Input: synaptics - use dmax in input_mt_assign_slots"Dmitry Torokhov1-4/+1
2015-03-16Merge branch 'synaptics' into for-linusDmitry Torokhov2-51/+184
2015-03-16Merge remote-tracking branches 'regulator/fix/gpio-enable' and 'regulator/fix...Mark Brown2-17/+18
2015-03-16regulator: tps65910: Add missing #include <linux/of.h>Geert Uytterhoeven1-0/+1
2015-03-16dmaengine: imx-sdma: switch to dynamic context mode after script loadedRobin Gong1-3/+4
2015-03-16drm/i915: Ensure plane->state->fb stays in sync with plane->fbXi Ruoyao1-0/+17
2015-03-15isdn: icn: use strlcpy() when parsing setup optionsDan Carpenter1-1/+1
2015-03-15Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds1-1/+1
2015-03-15Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds6-24/+59
2015-03-16[PATCH] drm/mm: Fix support 4 GiB and larger rangesKrzysztof Kolasa1-1/+1
2015-03-15Merge tag 'irqchip-fixes-4.0' of git://git.infradead.org/users/jcooper/linuxLinus Torvalds4-39/+161
2015-03-15HID: tivo: enable all buttons on the TiVo Slide Pro remoteForest Wilkinson3-0/+3
2015-03-15usb: chipidea: otg: add a_alt_hnp_support response for B deviceLi Jun1-0/+11
2015-03-15Merge tag 'for-4.0-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kisho...Greg Kroah-Hartman17-66/+45
2015-03-15Merge branch 'irqchip/urgent-gic' into irqchip/urgentJason Cooper3-38/+141
2015-03-14Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds10-110/+155
2015-03-14Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/...Linus Torvalds1-2/+4
2015-03-14Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfioLinus Torvalds1-0/+2
2015-03-14Merge tag 'fixes-for-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g...Greg Kroah-Hartman9-536/+40
2015-03-14can: kvaser_usb: Fix tx queue start/stop race conditionsAhmed S. Darwish1-32/+51
2015-03-14net: can: Enable xilinx driver for ARM64Michal Simek1-1/+1
2015-03-13powercap / RAPL: handle domains with different energy unitsJacob Pan1-15/+39
2015-03-13Merge tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds1-1/+4
2015-03-13Merge branch 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezca...Rafael J. Wysocki1-6/+6
2015-03-13Merge tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds4-20/+63
2015-03-13Merge tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds4-21/+40
2015-03-13Merge branch 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsLinus Torvalds2-398/+272
2015-03-13cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCsSebastien Rannou1-4/+4
2015-03-13cpuidle: mvebu: Fix the CPU PM notifier usageGregory CLEMENT1-2/+2
2015-03-13Revert "net: fec: fix the warning found by dma debug"Fabio Estevam1-23/+11
2015-03-13vxlan: fix wrong usage of VXLAN_VID_MASKAlexey Kodanev1-2/+2
2015-03-13tulip_core.c : out-of-bounds check.Ameen Ali1-1/+1
2015-03-13phy: omap-usb2: Fix missing clk_prepare call when using old dt nameAxel Lin1-2/+3
2015-03-13phy: ti/omap: Fix modaliasAxel Lin3-3/+3
2015-03-13phy: core: Fixup return value of phy_exit when !pm_runtime_enabledAxel Lin1-4/+3
2015-03-13phy: miphy28lp: Convert to devm_kcalloc and fix wrong sizofAxel Lin1-3/+2
2015-03-13phy: miphy365x: Convert to devm_kcalloc and fix wrong sizeofAxel Lin1-3/+2
2015-03-13phy: twl4030-usb: Remove redundant assignment for twl->linkstatAxel Lin1-1/+0
2015-03-13phy: exynos5-usbdrd: Fix off-by-one valid value checking for args->args[0]Axel Lin1-1/+1
2015-03-13phy: Find the right match in devm_phy_destroy()Thierry Reding1-1/+3
2015-03-13dmaengine: at_hdmac: Fix calculation of the residual bytesTorsten Fleischer2-76/+115
2015-03-13virtio_mmio: generation supportMichael S. Tsirkin1-0/+11
2015-03-13virtio_rpmsg: set DRIVER_OK before using deviceMichael S. Tsirkin1-1/+16
2015-03-12drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC dataJavier Martinez Canillas1-0/+1
2015-03-13Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux int...Dave Airlie2-27/+47
2015-03-13Merge branch 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linu...Dave Airlie3-57/+53
2015-03-13Merge tag 'drm-intel-fixes-2015-03-12' of git://anongit.freedesktop.org/drm-i...Dave Airlie3-7/+28
2015-03-12virtio-net: correctly delete napi hashJason Wang1-5/+4
2015-03-12Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-3/+0
2015-03-12Merge tag 'pci-v4.0-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2-4/+5
2015-03-12vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEXAlexey Kardashevskiy1-0/+2
2015-03-12mfd: kempld-core: Fix callback return value checkAmeya Palande1-1/+1
2015-03-12mfd: rtsx_usb: Prevent DMA from stackRoger Tseng1-6/+24
2015-03-12Revert "i2c: core: Dispose OF IRQ mapping at client removal time"Jakub Kicinski1-3/+0
2015-03-12phy: rockchip-usb: Fixup rockchip_usb_phy_power_on failure pathAxel Lin1-3/+3
2015-03-12phy: ti-pipe3: Simplify ti_pipe3_dpll_wait_lock implementationAxel Lin1-7/+3
2015-03-12phy: samsung-usb2: Remove NULL terminating entry from phys arrayAxel Lin3-3/+0
2015-03-12phy: hix5hd2-sata: Check return value of platform_get_resourceAxel Lin1-0/+3
2015-03-12phy: exynos-dp-video: Kill exynos_dp_video_phy_pwr_isol functionAxel Lin1-20/+4
2015-03-11xen-netback: notify immediately after pushing Tx response.David Vrabel1-11/+12
2015-03-11clk: introduce clk_is_matchMichael Turquette1-0/+26
2015-03-11clk: don't export static symbolJulia Lawall1-1/+0
2015-03-11drm/vmwgfx: Fix an issue with the device losing its irq line on module unloadThomas Hellstrom1-0/+1
2015-03-11drm/vmwgfx: Correctly NULLify dma buffer pointer on failureColin Ian King1-4/+6
2015-03-11drm/vmwgfx: Reorder device takedown somewhatThomas Hellstrom1-37/+40
2015-03-11drm/vmwgfx: Fix a couple of lock dependency violationsThomas Hellstrom2-16/+6
2015-03-11HID: add ALWAYS_POLL quirk for a Logitech 0xc007oliver@neukum.org2-0/+2
2015-03-11serial: 8250_dw: Fix deadlock in LCR workaroundPeter Hurley1-3/+12
2015-03-11Revert "usb: gadget: zero: Add support for interrupt EP"Felipe Balbi4-526/+22
2015-03-11xen-pciback: limit guest control of command registerJan Beulich3-14/+51
2015-03-11Revert "pcmcia: add a new resource manager for non ISA systems"Greg Kroah-Hartman3-182/+3
2015-03-11Revert "pcmcia: fix incorrect bracketing on a test"Greg Kroah-Hartman1-1/+1
2015-03-11Revert "pcmcia: add missing include for new pci resource handler"Greg Kroah-Hartman1-1/+0
2015-03-11Revert "xhci: Clear the host side toggle manually when endpoint is 'soft reset'"Mathias Nyman3-94/+10
2015-03-11drm/radeon: drop setting UPLL to sleep modeChristian König1-4/+2
2015-03-11drm/radeon: fix wait to actually occur after the signaling callbackMaarten Lankhorst1-23/+45
2015-03-11phy: exynos-mipi-video: Use spin_lock to protct state->regmap rmw operationsAxel Lin1-6/+3
2015-03-10Merge tag 'for-linus-20150310' of git://git.infradead.org/linux-mtdLinus Torvalds2-6/+45
2015-03-10Merge tag 'iommu-fixes-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds5-2/+26
2015-03-10usb: phy: am335x-control: check return value of bus_find_deviceDavid Dueck1-0/+3
2015-03-10usb: dwc2: host: fix dwc2 disconnect bugYunzhi Li1-0/+3
2015-03-10Merge tag 'wireless-drivers-for-davem-2015-03-10' of git://git.kernel.org/pub...David S. Miller13-44/+109
2015-03-10cxgb4: fix coccinelle warningsHariprasad Shenai1-1/+1
2015-03-10net: fec: fix receive VLAN CTAG HW acceleration issueNimrod Andy1-2/+1
2015-03-10of: unittest: Add options string testcase variantsPeter Hurley1-0/+11
2015-03-10of: fix handling of '/' in options for of_find_node_by_path()Leif Lindholm1-8/+15
2015-03-10of/unittest: Fix the wrong expected value in of_selftest_property_stringWang Long1-2/+2