aboutsummaryrefslogtreecommitdiffstatshomepage
AgeCommit message (Expand)AuthorFilesLines
2019-09-10Merge tag 'ipc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/a...HEADmasterLinus Torvalds4-39/+40
2019-09-09Merge tag 'regulator-fix-v5.3-rc8' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds3-9/+26
2019-09-08Linux 5.3-rc8v5.3-rc8Linus Torvalds1-1/+1
2019-09-08Merge tag 'compiler-attributes-for-linus-v5.3-rc8' of git://github.com/ojeda/...Linus Torvalds1-4/+4
2019-09-08Merge tag 'gpio-v5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/linu...Linus Torvalds1-9/+6
2019-09-08include/linux/compiler.h: fix Oops for Clang-compiled kernelsNick Desaulniers1-4/+4
2019-09-07Revert "x86/apic: Include the LDR when clearing out APIC registers"Linus Torvalds1-4/+0
2019-09-07ipc: fix sparc64 ipc() wrapperArnd Bergmann3-38/+39
2019-09-07Merge tag 'char-misc-5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds1-7/+7
2019-09-07Documentation/process: Add Qualcomm process ambassador for hardware security ...Trilok Soni1-1/+1
2019-09-07Merge tag 'dmaengine-fix-5.3' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds4-13/+33
2019-09-06Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/...Linus Torvalds2-2/+2
2019-09-06Merge tag 'libnvdimm-fix-5.3-rc8' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds1-1/+4
2019-09-06Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds1-1/+1
2019-09-06Input: elan_i2c - remove Lenovo Legion Y7000 PnpIDBenjamin Tissoires1-1/+1
2019-09-06Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc...Linus Torvalds3-3/+10
2019-09-06ipc: fix semtimedop for generic 32-bit architecturesArnd Bergmann1-1/+1
2019-09-06Merge tag 'configfs-for-5.3' of git://git.infradead.org/users/hch/configfsLinus Torvalds3-175/+257
2019-09-06Merge tag 'iommu-fixes-v5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds4-31/+103
2019-09-06Merge tag 'mmc-v5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulf...Linus Torvalds1-1/+1
2019-09-06Merge tag 'drm-fixes-2019-09-06' of git://anongit.freedesktop.org/drm/drmLinus Torvalds6-14/+202
2019-09-06Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds5-562/+17
2019-09-06Merge tag 'powerpc-5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/po...Linus Torvalds2-18/+4
2019-09-06Documentation/process/embargoed-hardware-issues: Microsoft ambassadorSasha Levin1-1/+1
2019-09-06soc: qcom: geni: Provide parameter error checkingLee Jones1-0/+6
2019-09-06iommu/amd: Fix race in increase_address_space()Joerg Roedel1-5/+11
2019-09-06iommu/amd: Flush old domains in kdump kernelStuart Hayes1-0/+24
2019-09-06Merge tag 'drm-misc-fixes-2019-09-05' of git://anongit.freedesktop.org/drm/dr...Dave Airlie4-9/+187
2019-09-06Merge branch 'vmwgfx-fixes-5.3' of git://people.freedesktop.org/~thomash/linu...Dave Airlie1-5/+3
2019-09-05keys: Fix missing null pointer check in request_key_auth_describe()Hillf Danton1-0/+6
2019-09-05Merge tag 'sound-5.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds4-3/+22
2019-09-05Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds3-4/+9
2019-09-05Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2-39/+44
2019-09-05Merge tag 'clang-format-for-linus-v5.3-rc8' of git://github.com/ojeda/linuxLinus Torvalds1-3/+14
2019-09-05Merge tag 'renesas-fixes2-for-v5.3' of git://git.kernel.org/pub/scm/linux/ker...Arnd Bergmann1-0/+1
2019-09-05drm/vmwgfx: Fix double free in vmw_recv_msg()Dan Carpenter1-5/+3
2019-09-05Documentation/process: Add Google contact for embargoed hardware issuesKees Cook1-4/+4
2019-09-05Documentation/process: Volunteer as the ambassador for XenAndrew Cooper1-1/+1
2019-09-04configfs: provide exclusion between IO and removalsAl Viro2-18/+80
2019-09-04Merge tag 'nfs-for-5.3-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds1-8/+10
2019-09-04sched/core: Fix uclamp ABI bug, clean up and robustify sched_read_attr() ABI ...Ingo Molnar1-39/+39
2019-09-04Merge tag 'renesas-fixes-for-v5.3' of git://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann1-3/+3
2019-09-04powerpc/tm: Fix restoring FP/VMX facility incorrectly on interruptsGustavo Romero1-16/+2
2019-09-04powerpc/tm: Fix FP/VMX unavailable exceptions inside a transactionGustavo Romero1-1/+2
2019-09-04mm/balloon_compaction: suppress allocation warningsNadav Amit1-1/+2
2019-09-04Revert "vhost: access vq metadata through kernel virtual address"Michael S. Tsirkin2-553/+3
2019-09-04vhost: Remove unnecessary variableYunsheng Lin1-3/+2
2019-09-04virtio-net: lower min ring num_free for efficiency? jiang1-1/+1
2019-09-04vhost/test: fix build for vhost testTiwei Bie1-4/+9
2019-09-04vhost/test: fix build for vhost testTiwei Bie1-1/+1
2019-09-04ALSA: hda/realtek - Fix the problem of two front mics on a ThinkCentreHui Wang1-0/+2
2019-09-04dmaengine: rcar-dmac: Fix DMACHCLR handling if iommu is mappedYoshihiro Shimoda1-9/+19
2019-09-04dmaengine: sprd: Fix the DMA link-list configurationBaolin Wang1-2/+8
2019-09-03Revert "mmc: core: do not retry CMD6 in __mmc_switch()"Jan Kaisrlik1-1/+1
2019-09-03iommu/vt-d: Remove global page flush supportJacob Pan2-24/+15
2019-09-03Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-fixesDave Airlie1-0/+12
2019-09-03sched/fair: Don't assign runtime for throttled cfs_rqLiangyan1-0/+5
2019-09-03ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FLJian-Hong Pan1-0/+12
2019-09-02configfs: new object reprsenting tree fragmentsAl Viro3-27/+97
2019-09-02configfs_register_group() shouldn't be (and isn't) called in rmdirable partsAl Viro1-11/+0
2019-09-02configfs: stash the data we need into configfs_buffer at open timeAl Viro1-134/+95
2019-09-02x86/hyper-v: Fix overflow bug in fill_gva_list()Tianyu Lan1-3/+5
2019-09-02NFS: Fix inode fileid checks in attribute revalidation codeTrond Myklebust1-8/+10
2019-09-02Linux 5.3-rc7v5.3-rc7Linus Torvalds1-1/+1
2019-09-02Merge tag 'char-misc-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds12-18/+328
2019-09-02Merge tag 'usb-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds11-47/+82
2019-09-02ALSA: hda/realtek - Add quirk for HP Pavilion 15Sam Bazley1-0/+1
2019-09-02x86/uaccess: Don't leak the AC flags into __get_user() argument evaluationPeter Zijlstra1-1/+3
2019-09-02x86/boot: Preserve boot_params.secure_boot from sanitizingJohn S. Gruber1-0/+1
2019-09-02drm/nouveau/sec2/gp102: add missing MODULE_FIRMWAREsBen Skeggs1-0/+12
2019-09-01Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netLinus Torvalds89-487/+761
2019-09-01net: seeq: Fix the function used to release some memory in an error handling ...Christophe JAILLET1-3/+4
2019-09-01Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds7-39/+43
2019-09-01Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds3-7/+24
2019-09-01Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/len...Linus Torvalds5-47/+90
2019-08-31enetc: Add missing call to 'pci_free_irq_vectors()' in probe and remove funct...Christophe JAILLET1-1/+4
2019-08-31net: bcmgenet: use ethtool_op_get_ts_info()Ryan M. Collins1-0/+1
2019-08-31tc-testing: don't hardcode 'ip' in nsPlugin.pyDavide Caratti1-11/+11
2019-08-31Merge branch 'net-dsa-microchip-add-KSZ8563-support'David S. Miller2-0/+2
2019-08-31net: dsa: microchip: add KSZ8563 compatibility stringRazvan Stefanescu1-0/+1
2019-08-31dt-bindings: net: dsa: document additional Microchip KSZ8563 switchRazvan Stefanescu1-0/+1
2019-08-31Merge branch 'net-aquantia-fixes-on-vlan-filters-and-other-conditions'David S. Miller4-4/+10
2019-08-31net: aquantia: fix out of memory condition on rx sideDmitry Bogdanov1-1/+2
2019-08-31net: aquantia: linkstate irq should be oneshotIgor Russkikh1-1/+1
2019-08-31net: aquantia: reapply vlan filters on upDmitry Bogdanov1-0/+4
2019-08-31net: aquantia: fix limit of vlan filtersDmitry Bogdanov1-1/+1
2019-08-31net: aquantia: fix removal of vlan 0Dmitry Bogdanov1-1/+2
2019-08-31Merge branch 'Fix-issues-in-tc-taprio-and-tc-cbs'David S. Miller2-22/+28
2019-08-31net/sched: cbs: Set default link speed to 10 Mbps in cbs_set_port_rateVladimir Oltean1-8/+11
2019-08-31taprio: Set default link speed to 10 Mbps in taprio_set_picos_per_byteVladimir Oltean1-10/+13
2019-08-31taprio: Fix kernel panic in taprio_destroyVladimir Oltean1-4/+4
2019-08-31net: dsa: microchip: fill regmap_config nameGeorge McCollister1-0/+1
2019-08-31Merge tag 'batadv-net-for-davem-20190830' of git://git.open-mesh.org/linux-mergeDavid S. Miller2-13/+25
2019-08-31tools/power turbostat: update version numberLen Brown1-1/+1
2019-08-31tools/power turbostat: Add support for Hygon Fam 18h (Dhyana) RAPLPu Wen1-2/+7
2019-08-31tools/power turbostat: Fix caller parameter of get_tdp_amd()Pu Wen1-1/+1
2019-08-31tools/power turbostat: Fix CPU%C1 display valueSrinivas Pandruvada1-6/+17
2019-08-31tools/power turbostat: do not enforce 1msArtem Bityutskiy1-5/+0
2019-08-31tools/power turbostat: read from pipes tooArtem Bityutskiy1-4/+16
2019-08-31tools/power turbostat: Add Ice Lake NNPI supportRajneesh Bhardwaj1-0/+1
2019-08-31tools/power turbostat: rename has_hsw_msrs()Len Brown1-4/+4
2019-08-31tools/power turbostat: Fix Haswell Core systemsLen Brown1-4/+6
2019-08-31tools/power turbostat: add Jacobsville supportZhang Rui1-0/+3
2019-08-31tools/power turbostat: fix buffer overrunNaoya Horiguchi1-1/+1
2019-08-31tools/power turbostat: fix file descriptor leaksGustavo A. R. Silva1-0/+1
2019-08-31tools/power turbostat: fix leak of file descriptor on error return pathColin Ian King1-0/+1
2019-08-31tools/power turbostat: Make interval calculation per thread to reduce jitterYazen Ghannam1-3/+10
2019-08-31tools/power turbostat: remove duplicate pc10 columnLen Brown1-1/+0
2019-08-31tools/power x86_energy_perf_policy: Fix argument parsingZephaniah E. Loss-Cutler-Hull1-1/+1
2019-08-31tools/power: Fix typo in man pageMatt Lupfer1-1/+1
2019-08-31tools/power/x86: Enable compiler optimisations and Fortify by defaultBen Hutchings2-2/+4
2019-08-31tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2Ben Hutchings1-11/+15
2019-08-31Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds7-14/+34
2019-08-31Merge tag 'trace-v5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds6-15/+35
2019-08-31Merge tag 'riscv/for-v5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2-6/+10
2019-08-31Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds6-16/+19
2019-08-31Merge branch 'akpm' (patches from Andrew)Linus Torvalds6-22/+47
2019-08-31tracing: Correct kdoc formatsJakub Kicinski1-12/+14
2019-08-31ftrace/x86: Remove mcount() declarationJisheng Zhang1-1/+0
2019-08-31tracing/probe: Fix null pointer dereferenceXinpeng Liu1-1/+2
2019-08-31tracing: Make exported ftrace_set_clr_event non-staticDenis Efremov2-1/+2
2019-08-31arm64: dts: renesas: hihope-common: Fix eMMC statusFabrizio Castro1-0/+1
2019-08-31clang-format: Update with the latest for_each macro listMiguel Ojeda1-3/+14
2019-08-30Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds1-0/+8
2019-08-30Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"Linus Torvalds1-1/+2
2019-08-30mm: memcontrol: fix percpu vmstats and vmevents flushShakeel Butt1-5/+5
2019-08-30mm, memcg: do not set reclaim_state on soft limit reclaimMichal Hocko1-2/+3
2019-08-30mailmap: add aliases for Dmitry SafonovDmitry Safonov1-0/+3
2019-08-30mm/z3fold.c: fix lock/unlock imbalance in z3fold_page_isolateGustavo A. R. Silva1-0/+1
2019-08-30mm, memcg: partially revert "mm/memcontrol.c: keep local VM counters in sync ...Roman Gushchin1-5/+3
2019-08-30mm/zsmalloc.c: fix build when CONFIG_COMPACTION=nAndrew Morton1-0/+2
2019-08-30mm: memcontrol: flush percpu slab vmstats on kmem offliningRoman Gushchin2-10/+30
2019-08-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller5-7/+11
2019-08-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfDavid S. Miller2-6/+19
2019-08-30rxrpc: Fix lack of conn cleanup when local endpoint is cleaned up [ver #2]David Howells5-5/+50
2019-08-30Merge tag 'rxrpc-fixes-20190827' of git://git.kernel.org/pub/scm/linux/kernel...David S. Miller14-268/+319
2019-08-30net: stmmac: dwmac-rk: Don't fail if phy regulator is absentChen-Yu Tsai1-4/+2
2019-08-30amd-xgbe: Fix error path in xgbe_mod_init()YueHaibing1-2/+8
2019-08-30ftrace: Check for successful allocation of hashNaveen N. Rao1-0/+5
2019-08-30ftrace: Check for empty hash and comment the race with registering probesSteven Rostedt (VMware)1-1/+9
2019-08-30ftrace: Fix NULL pointer dereference in t_probe_next()Naveen N. Rao1-0/+4
2019-08-30Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds2-2/+8
2019-08-30keys: ensure that ->match_free() is called in request_key_and_link()Eric Biggers1-1/+1
2019-08-30Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc...Linus Torvalds29-135/+250
2019-08-30Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdmaLinus Torvalds1-11/+20
2019-08-30Merge tag 'ceph-for-5.3-rc7' of git://github.com/ceph/ceph-clientLinus Torvalds2-2/+15
2019-08-30Merge tag 'mmc-v5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulf...Linus Torvalds5-5/+49
2019-08-30Merge tag 'drm-fixes-2019-08-30' of git://anongit.freedesktop.org/drm/drmLinus Torvalds16-47/+161
2019-08-30Revert "iommu/vt-d: Avoid duplicated pci dma alias consideration"Lu Baolu1-2/+53
2019-08-30Merge tag 'gpio-v5.3-rc7-fixes-for-linus' of git://git.kernel.org/pub/scm/lin...Linus Walleij1-9/+6
2019-08-30i2c: mediatek: disable zero-length transfers for mt8183Hsin-Yi Wang1-1/+10
2019-08-30i2c: iproc: Stop advertising support of SMBUS quick cmdLori Hikichi1-1/+4
2019-08-30MAINTAINERS: i2c mv64xxx: Update documentation pathDenis Efremov1-1/+1
2019-08-30perf/x86/amd/ibs: Fix sample bias for dispatched micro-opsKim Phillips2-7/+18
2019-08-30perf/x86/intel: Restrict period on NehalemJosh Hunt1-0/+6
2019-08-30ALSA: hda/realtek - Fix overridden device-specific initializationTakashi Iwai3-1/+5
2019-08-30drm/selftests: modes: Add more unit tests for the cmdline parserMaxime Ripard2-0/+137
2019-08-30drm/modes: Introduce a whitelist for the named modesMaxime Ripard1-0/+20
2019-08-30drm/modes: Fix the command line parser to take force options into accountMaxime Ripard1-5/+19
2019-08-30drm/modes: Add a switch to differentiate free standing optionsMaxime Ripard1-1/+9
2019-08-30mmc: sdhci-cadence: enable v4_mode to fix ADMA 64-bit addressingMasahiro Yamada1-0/+1
2019-08-30mmc: sdhci-sprd: clear the UHS-I modes read from registersChunyan Zhang1-1/+12
2019-08-30mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTIONChunyan Zhang1-1/+2
2019-08-30mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKENChunyan Zhang1-1/+2
2019-08-30mmc: sdhci-sprd: add get_ro hook functionChunyan Zhang1-0/+6
2019-08-30mmc: sdhci-sprd: fixed incorrect clock dividerChunyan Zhang1-3/+4
2019-08-30mmc: core: Fix init of SD cards reporting an invalid VDD rangeUlf Hansson1-0/+6
2019-08-30Merge tag 'drm-intel-fixes-2019-08-29' of git://anongit.freedesktop.org/drm/d...Dave Airlie4-2/+19
2019-08-30Merge tag 'drm-fixes-5.3-2019-08-28' of git://people.freedesktop.org/~agd5f/l...Dave Airlie5-27/+92
2019-08-29Merge tag '5.3-rc6-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds7-147/+135
2019-08-30netfilter: nft_meta_bridge: Fix get NFT_META_BRI_IIFVPROTO in network byteorderwenxu1-1/+1
2019-08-30Merge tag 'drm-misc-fixes-2019-08-28' of git://anongit.freedesktop.org/drm/dr...Dave Airlie7-18/+50
2019-08-29Merge tag 'mac80211-for-davem-2019-08-29' of git://git.kernel.org/pub/scm/lin...David S. Miller5-9/+34
2019-08-29scsi: lpfc: Raise config max for lpfc_fcp_mq_threshold variableJames Smart2-2/+2
2019-08-29i2c: piix4: Fix port selection for AMD Family 16h Model 30hAndrew Cooks1-7/+5
2019-08-29x86/mm/cpa: Prevent large page split when ftrace flips RW on kernel textThomas Gleixner1-8/+18
2019-08-29i2c: designware: Synchronize IRQs when unregistering slave clientJarkko Nikula1-0/+1
2019-08-29i2c: i801: Avoid memory leak in check_acpi_smo88xx_device()Andy Shevchenko1-3/+12
2019-08-29i2c: make i2c_unregister_device() ERR_PTR safeWolfram Sang1-1/+1
2019-08-29Merge tag 'Wimplicit-fallthrough-5.3-rc7' of git://git.kernel.org/pub/scm/lin...Linus Torvalds3-0/+8
2019-08-29Merge tag 'mtd/fixes-for-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds1-0/+1
2019-08-29nds32: Mark expected switch fall-throughsGustavo A. R. Silva2-0/+7
2019-08-29ARC: unwind: Mark expected switch fall-throughGustavo A. R. Silva1-0/+1
2019-08-29soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TESTGeert Uytterhoeven1-0/+4
2019-08-29Merge tag 'sunxi-fixes-for-5.3-3' of git://git.kernel.org/pub/scm/linux/kerne...Arnd Bergmann2-5/+7
2019-08-29Merge tag 'hisi-fixes-for-5.3' of git://github.com/hisilicon/linux-hisi into ...Arnd Bergmann3-25/+96
2019-08-29mac80211: Correctly set noencrypt for PAE framesDenis Kenzior1-1/+1
2019-08-29mac80211: Don't memset RXCB prior to PAE interceptDenis Kenzior1-2/+2
2019-08-29iwlwifi: pcie: handle switching killer Qu B0 NICs to C0Luca Coelho4-6/+31
2019-08-29netfilter: nf_flow_table: clear skb tstamp before xmitFlorian Westphal1-1/+2
2019-08-29ALSA: hda - Fix potential endless loop at applying quirksTakashi Iwai1-2/+2
2019-08-29mtd: hyperbus: fix dependency and build errorRandy Dunlap1-0/+1
2019-08-29drm/ingenic: Hardcode panel type to DPILaurent Pinchart1-3/+2
2019-08-28sky2: Disable MSI on yet another ASUS boards (P6Xxxx)Takashi Iwai1-0/+7
2019-08-28Merge branch 'nfp-flower-fix-bugs-in-merge-tunnel-encap-code'David S. Miller2-7/+8
2019-08-28nfp: flower: handle neighbour events on internal portsJohn Hurley1-4/+4
2019-08-28nfp: flower: prevent ingress block binds on internal portsJohn Hurley1-3/+4
2019-08-28Merge branch 'r8152-fix-side-effect'David S. Miller1-4/+1
2019-08-28r8152: remove calling netif_napi_delHayes Wang1-2/+0
2019-08-28Revert "r8152: napi hangup fix after disconnect"Hayes Wang1-2/+1