aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-01-25KVM: arm64: nv: Rework nested GICv3 supportkvm-arm64/edf-wipChristoffer Dall9-219/+216
2019-01-25KVM: arm/arm64: nv: gicv3: Disable nested virt if trapping gicv3Christoffer Dall1-0/+6
2019-01-25arm64: vhe: Initialize ICC_SRE_EL2 at boot instead of every time we run a VMChristoffer Dall2-6/+12
2019-01-24random fixesMarc Zyngier3-10/+13
2019-01-23KVM: arm64: nv: Sync nested timer state with ARMv8.4Christoffer Dall3-3/+41
2019-01-23KVM: arm/arm64: Add ARMv8.4 Enhanced Nested Virt cpufeatureChristoffer Dall4-1/+19
2019-01-23KVM: arm/arm64: arch_timers: Move timer registers to sysreg arrayChristoffer Dall3-41/+71
2019-01-23more refactor crapMarc Zyngier14-109/+117
2019-01-23WIP: __vcpu_sys_reg and __ctx_sys_reg indirectionChristoffer Dall6-149/+143
2019-01-23WIPMarc Zyngier8-97/+80
2019-01-21fixup! KVM: arm64: nv: Save/Restore vEL2 sysregsMarc Zyngier1-0/+10
2019-01-20fixup! arm64: KVM: nv: Introduce vtcr_to_walk_info helperMarc Zyngier1-1/+1
2019-01-20arm64: Add SW reserved PTE/PMD bitsMarc Zyngier1-0/+2
2019-01-20arm64: KVM: nv: Invalidate TLBs based on shadow S2 TTL-like informationMarc Zyngier3-6/+101
2019-01-20arm64: KVM: nv: Introduce vtcr_to_walk_info helperMarc Zyngier1-15/+22
2019-01-20arm64: KVM: nv: Populate upper_attr whenever availableMarc Zyngier1-0/+5
2019-01-20arm64: KVM: nv: Shut up GCC warning in walk_nested_s2_pgdMarc Zyngier1-1/+1
2019-01-20arm64: KVM: nv: Drop vcpu from walk_nested_s2_pgdMarc Zyngier1-3/+3
2019-01-20arm64: KVM: nv: Move 32bit capability inside the walk info structureMarc Zyngier1-3/+5
2019-01-20arm64: KVM: nv: Drop vcpu from check_output_sizeMarc Zyngier1-5/+4
2019-01-20arm64: KVM: nv: Only generate the FSC in the S2PTWMarc Zyngier1-9/+18
2019-01-20arm64: KVM: nv: Move max PA bits into s2_walk_infoMarc Zyngier1-12/+9
2019-01-20arm64: KVM: nv: Move desc accessor in the s2_walk_info structureMarc Zyngier1-1/+12
2019-01-20arm64: KVM: nv: Move the S2PT base address in the s2_walk_info structureMarc Zyngier1-2/+3
2019-01-20arm64: KVM: nv: Move endianess information to s2_walk_infoMarc Zyngier1-1/+3
2019-01-20arm64: KVM: nv: Fix range check of VTTBR_EL2.BADDRMarc Zyngier1-5/+5
2019-01-20arm64: KVM: nv: Add handling of ARMv8.4-TTL TLB invalidationMarc Zyngier1-26/+88
2019-01-20arm64: Detect the ARMv8.4 TTL featureMarc Zyngier3-1/+14
2019-01-20dma crap hacksMarc Zyngier3-2/+8
2019-01-20arm64: KVM: nv: Restrict S2 RD/WR permissions to match the guest'sMarc Zyngier4-1/+66
2019-01-20arm64: KVM: nv: Handle SCTLR_EL2 RES0/RES1 bitsMarc Zyngier1-1/+27
2019-01-20arm64: KVM: nv: Honor SCTLR_EL2.SPAN on entering vEL2Marc Zyngier1-1/+12
2019-01-20arm64: KVM: nv: Add handling of EL2-specific timer registersMarc Zyngier1-0/+36
2019-01-20KVM: arm64: nv: Add nested GICv3 tracepointsChristoffer Dall2-1/+148
2019-01-20KVM: arm64: nv: Implement maintenance interrupt forwardingMarc Zyngier3-5/+52
2019-01-20KVM: arm64: nv: vgic: Allow userland to set VGIC maintenance IRQAndre Przywara5-0/+36
2019-01-20KVM: arm64: nv: vgic: Emulate the HW bit in softwareChristoffer Dall5-5/+42
2019-01-20KVM: arm64: nv: Nested GICv3 SupportJintack Lim12-6/+454
2019-01-20KVM: arm64: nv: vgic-v3: Take cpu_if pointer directly instead of vcpuChristoffer Dall9-63/+62
2019-01-20KVM: arm64: nv: Load timer before the GICMarc Zyngier1-1/+1
2019-01-20KVM: arm64: nv: Propagate CNTVOFF_EL2 to the virtual EL1 timerMarc Zyngier4-3/+24
2019-01-20KVM: arm64: nv: arch_timer: Support hyp timer emulationMarc Zyngier6-4/+148
2019-01-20KVM: arm64: nv: Handle traps for timer _EL02 and _EL2 sysregs accessorsAndre Przywara2-0/+21
2019-01-20KVM: arm64: nv: Trap and emulate TLBI instructions from virtual EL2Jintack Lim5-1/+337
2019-01-20KVM: arm64: nv: Trap and emulate AT instructions from virtual EL2Jintack Lim7-4/+450
2019-01-20KVM: arm64: nv: Rework the system instruction emulation frameworkJintack Lim1-34/+28
2019-01-20KVM: arm64: nv: Introduce sys_reg_desc.forward_trapJintack Lim2-0/+15
2019-01-20KVM: arm64: nv: Don't always start an S2 MMU search from the beginningMarc Zyngier2-2/+13
2019-01-20KVM: arm64: nv: Move last_vcpu_ran to be per s2 mmuMarc Zyngier7-39/+40
2019-01-20KVM: arm64: nv: Unmap/flush shadow stage 2 page tablesChristoffer Dall5-9/+82
2019-01-20KVM: arm64: nv: Handle shadow stage 2 page faultsChristoffer Dall6-26/+200
2019-01-20KVM: arm64: nv: Implement nested Stage-2 page table walk logicChristoffer Dall4-0/+257
2019-01-20KVM: arm/arm64: nv: Support multiple nested stage 2 mmu structuresChristoffer Dall8-15/+251
2019-01-20KVM: arm/arm64: nv: Factor out stage 2 page table data from struct kvmChristoffer Dall13-195/+230
2019-01-20KVM: arm64: nv: Pretend we only support larger-than-host page sizesJintack Lim1-1/+44
2019-01-20KVM: arm64: nv: Hide RAS from nested guestsMarc Zyngier1-3/+21
2019-01-20KVM: arm64: nv: Only toggle cache for virtual EL2 when SCTLR_EL2 changesChristoffer Dall1-1/+5
2019-01-20KVM: arm64: nv: Configure HCR_EL2 for nested virtualizationChristoffer Dall1-3/+33
2019-01-20KVM: arm64: nv: Emulate EL12 register accesses from the virtual EL2Jintack Lim3-24/+40
2019-01-20KVM: arm64: nv: Respect the virtual HCR_EL2.NV1 bit settingJintack Lim2-2/+18
2019-01-20KVM: arm64: nv: Respect virtual HCR_EL2.TVM and TRVM settingsJintack Lim1-0/+24
2019-01-20KVM: arm64: nv: Respect the virtual HCR_EL2.NV bit settingJintack Lim5-0/+55
2019-01-20KVM: arm64: nv: Respect virtual CPTR_EL2.TFP settingJintack Lim3-7/+25
2019-01-20KVM: arm64: nv: Respect virtual HCR_EL2.TWX settingJintack Lim4-1/+54
2019-01-20KVM: arm64: nv: Handle PSCI call via smc from the guestJintack Lim1-2/+22
2019-01-20KVM: arm64: nv: Set a handler for the system instruction trapsJintack Lim4-9/+50
2019-01-20KVM: arm64: nv: Trap CPACR_EL1 access in virtual EL2Jintack Lim3-2/+5
2019-01-20KVM: arm64: nv: Trap SPSR_EL1, ELR_EL1 and VBAR_EL1 from virtual EL2Jintack Lim2-1/+31
2019-01-20KVM: arm64: nv: Trap EL1 VM register accesses in virtual EL2Christoffer Dall2-1/+10
2019-01-20KVM: arm64: nv: Emulate PSTATE.M for a guest hypervisorChristoffer Dall1-2/+39
2019-01-20KVM: arm64: nv: Save/Restore vEL2 sysregsAndre Przywara1-9/+141
2019-01-20KVM: arm64: nv: Update vcpu_{read,write}_sys_regChristoffer Dall1-103/+134
2019-01-20KVM: arm64: nv: Handle spsr_EL2 speciallyMarc Zyngier2-1/+72
2019-01-20KVM: arm64: nv: Handle virtual EL2 registers in vcpu_read/write_sys_reg()Jintack Lim3-0/+174
2019-01-20KVM: arm64: nv: Handle trapped ERET from virtual EL2Christoffer Dall3-2/+11
2019-01-20KVM: arm64: nv: Inject HVC exceptions to the virtual EL2Jintack Lim1-0/+7
2019-01-20KVM: arm64: nv: Support virtual EL2 exceptionsJintack Lim6-12/+281
2019-01-20KVM: arm64: nv: Add nested virt VCPU primitives for vEL2 VCPU stateChristoffer Dall1-0/+55
2019-01-20KVM: arm64: nv: Reset VMPIDR_EL2 and VPIDR_EL2 to sane valuesMarc Zyngier1-4/+21
2019-01-20KVM: arm64: nv: Add EL2 system registers to vcpu contextJintack Lim3-7/+150
2019-01-20KVM: arm64: nv: Allow userspace to set PSR_MODE_EL2xChristoffer Dall1-0/+6
2019-01-20KVM: arm64: nv: Reset VCPU to EL2 registers if VCPU nested virt is setChristoffer Dall1-0/+7
2019-01-20KVM: arm64: nv: Introduce nested virtualization VCPU featureChristoffer Dall4-1/+24
2019-01-20arm64: Add ARM64_HAS_NESTED_VIRT cpufeatureJintack Lim4-1/+33
2019-01-20KVM: arm/arm64: Move kvm_is_write_fault to header fileChristoffer Dall3-8/+16
2019-01-20KVM: arm/arm64: Rework the timer code to use a timer_mapChristoffer Dall3-146/+276
2019-01-20KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systemsChristoffer Dall3-45/+171
2019-01-20KVM: arm/arm64: timer: Rework data structures for multiple timersChristoffer Dall2-48/+54
2019-01-20clocksource/arm_arch_timer: Store physical timer IRQ number for KVM on VHEAndre Przywara2-2/+10
2019-01-20KVM: arm/arm64: consolidate arch timer trap handlersAndre Przywara5-63/+196
2019-01-20arm64: Reuse sys_reg() macro when searching the trap tableMarc Zyngier1-13/+6
2019-01-20KVM: arm64: Fix ICH_ELRSR_EL2 sysreg namingMarc Zyngier3-4/+4
2019-01-20KVM: arm/arm64: Simplify bg_timer programmingChristoffer Dall3-26/+14
2019-01-20KVM: arm/arm64: Factor out VMID into struct kvm_vmidChristoffer Dall9-49/+63
2019-01-20arm/arm64: KVM: Statically configure the host's view of MPIDRMarc Zyngier5-2/+17
2019-01-14ARM: KVM: Teach some form of type-safety to kvm_call_hypMarc Zyngier3-6/+31
2019-01-14arm64: KVM: Drop VHE-specific HYP call stubMarc Zyngier2-15/+0
2019-01-14arm64: KVM: Allow for direct call of HYP functions when using VHEMarc Zyngier1-2/+30
2019-01-14arm/arm64: KVM: Introduce kvm_call_hyp_ret()Marc Zyngier5-4/+8
2019-01-14Linux 5.0-rc2Linus Torvalds1-1/+1
2019-01-14kernel/sys.c: Clarify that UNAME26 does not generate unique versions anymoreJonathan Neuschäfer1-1/+2
2019-01-14Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds26-93/+321
2019-01-14Merge tag 'for-5.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds3-13/+64
2019-01-14Merge tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds6-10/+17
2019-01-14Merge tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds3-4/+9
2019-01-14Merge tag 'tty-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2-24/+32
2019-01-14Merge tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds6-7/+33
2019-01-14Merge tag '5.0-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds10-65/+211
2019-01-12Merge tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux into ...Olof Johansson11-52/+212
2019-01-12Merge tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu into fixesOlof Johansson3-3/+20
2019-01-12Merge tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson1-2/+6
2019-01-12Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/...Olof Johansson1-0/+4
2019-01-12Merge tag 'qcom-fixes-for-5.0-rc1' of git://git.kernel.org/pub/scm/linux/kern...Olof Johansson1-0/+1
2019-01-12Merge tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kern...Olof Johansson7-16/+73
2019-01-12Merge tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/ke...Olof Johansson2-20/+5
2019-01-12phy: fix build breakage: add PHY_MODE_SATAJohn Hubbard2-2/+4
2019-01-12Merge tag 'for-linus-20190112' of git://git.kernel.dk/linux-blockLinus Torvalds16-66/+229
2019-01-12Merge tag 'remove-dma_zalloc_coherent-5.0' of git://git.infradead.org/users/h...Linus Torvalds179-975/+923
2019-01-12Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds5-7/+14
2019-01-12Merge tag 'drm-fixes-2019-01-11-1' of git://anongit.freedesktop.org/drm/drmLinus Torvalds16-102/+192
2019-01-11ata: ahci: mvebu: request PHY suspend/resume for Armada 3700Miquel Raynal1-0/+3
2019-01-11ata: ahci: mvebu: add Armada 3700 initialization needed for S2RAMMiquel Raynal1-9/+18
2019-01-11ata: ahci: mvebu: do Armada 38x configuration only on relevant SoCsMiquel Raynal1-17/+51
2019-01-11ata: ahci: mvebu: remove stale commentMiquel Raynal1-5/+0
2019-01-11ata: libahci_platform: comply to PHY frameworkMiquel Raynal2-0/+15
2019-01-11Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2-1/+20
2019-01-11Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6...Linus Torvalds8-9/+59
2019-01-11Merge tag 'ceph-for-5.0-rc2' of git://github.com/ceph/ceph-clientLinus Torvalds8-18/+24
2019-01-11Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds43-697/+797
2019-01-11x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not...Vitaly Kuznetsov1-2/+1
2019-01-11Documentation/virtual/kvm: Update URL for AMD SEV API specificationChristophe de Dinechin1-1/+1
2019-01-11KVM/VMX: Avoid return error when flush tlb successfully in the hv_remote_flus...Lan Tianyu1-1/+1
2019-01-11kvm: sev: Fail KVM_SEV_INIT if already initializedDavid Rientjes1-0/+3
2019-01-11KVM: validate userspace input in kvm_clear_dirty_log_protect()Tomas Bortoli1-2/+7
2019-01-11KVM: x86: Fix bit shifting in update_intel_pt_cfgGustavo A. R. Silva1-1/+1
2019-01-11Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds11-12/+13
2019-01-11Merge tag 'acpi-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds4-11/+59
2019-01-11Merge tag 'pm-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds9-26/+89
2019-01-11Merge tag 'drm-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drmLinus Torvalds18-119/+221
2019-01-11tty: Don't hold ldisc lock in tty_reopen() if ldisc presentDmitry Safonov1-7/+13
2019-01-11cifs: update internal module version numberSteve French1-1/+1
2019-01-11CIFS: Fix error paths in writeback codePavel Shilovsky4-9/+56
2019-01-11CIFS: Move credit processing to mid callbacks for SMB3Pavel Shilovsky1-17/+34
2019-01-11CIFS: Fix credits calculation for cancelled requestsPavel Shilovsky2-2/+27
2019-01-11cifs: Fix potential OOB access of lock element arrayRoss Lagerwall2-6/+6
2019-01-11cifs: Limit memory used by lock request calls to a pageRoss Lagerwall2-0/+12
2019-01-11cifs: move large array from stack to heapAurelien Aptel2-14/+32
2019-01-11CIFS: Do not hide EINTR after sending network packetsPavel Shilovsky1-1/+1
2019-01-11ARM: integrator: impd1: use struct_size() in devm_kzalloc()Gustavo A. R. Silva1-1/+1
2019-01-11arm64: kexec_file: return successfully even if kaslr-seed doesn't existAKASHI Takahiro1-1/+3
2019-01-11ACPI/IORT: Fix rc_dma_get_range()Jean-Philippe Brucker1-1/+2
2019-01-11Revert "staging: rtl8723bs: Mark ACPI table declaration as used"Greg Kroah-Hartman1-1/+1
2019-01-11Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/d...Daniel Vetter10-39/+98
2019-01-11Merge tag 'drm-misc-fixes-2019-01-10-1' of git://anongit.freedesktop.org/drm/...Daniel Vetter3-58/+82
2019-01-11Merge branches 'acpi-pci', 'acpi-power' and 'acpi-misc'Rafael J. Wysocki3-3/+26
2019-01-11Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'Rafael J. Wysocki8-22/+82
2019-01-11Merge branch 'linux-4.21' of git://github.com/skeggsb/linux into drm-fixesDave Airlie3-5/+12
2019-01-11Merge tag 'perf-core-for-mingo-5.0-20190110' of git://git.kernel.org/pub/scm/...Ingo Molnar7-419/+470
2019-01-11drm/nouveau/falcon: avoid touching registers if engine is offIlia Mirkin1-2/+5
2019-01-11drm/nouveau: Don't disable polling in fallback modeTakashi Iwai1-3/+4
2019-01-11drm/nouveau: register backlight on pascal and newerBen Skeggs1-0/+3
2019-01-11i2c: tegra: Fix Maximum transfer sizeSowjanya Komatineni1-1/+14
2019-01-11i2c: dev: prevent adapter retries and timeout being set as minus valueYi Zeng1-0/+6
2019-01-10qcom-scm: Include <linux/err.h> headerFabio Estevam1-0/+1
2019-01-10Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linusJens Axboe6-39/+72
2019-01-10Merge tag 'pci-v5.0-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds1-0/+1
2019-01-11Merge branch 'drm-fixes-5.0' of git://people.freedesktop.org/~agd5f/linux int...Dave Airlie15-96/+156
2019-01-10Merge tag 'riscv-for-linus-4.21-rc2-v2' of git://git.kernel.org/pub/scm/linux...Linus Torvalds19-42/+189
2019-01-11Merge tag 'drm-misc-fixes-2019-01-10' of git://anongit.freedesktop.org/drm/dr...Dave Airlie3-23/+65
2019-01-10CIFS: Fix credit computation for compounded requestsPavel Shilovsky1-18/+41
2019-01-10CIFS: Do not set credits to 1 if the server didn't grant anythingPavel Shilovsky1-2/+0
2019-01-10CIFS: Fix adjustment of credits for MTU requestsPavel Shilovsky1-2/+6
2019-01-10cifs: Fix a tiny potential memory leakDan Carpenter1-0/+1
2019-01-10cifs: Fix a debug messageDan Carpenter1-3/+4
2019-01-10arm64: kpti: Avoid rewriting early page tables when KASLR is enabledWill Deacon5-5/+52
2019-01-10Merge tag 'vfio-v5.0-rc2' of git://github.com/awilliam/linux-vfioLinus Torvalds2-2/+2
2019-01-10Merge tag 'sound-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds7-20/+76
2019-01-10Merge tag 'mtd/fixes-for-5.0-rc2' of git://git.infradead.org/linux-mtdLinus Torvalds4-17/+43
2019-01-10btrfs: Use real device structure to verify dev extentQu Wenruo1-0/+12
2019-01-10gpio: pl061: handle failed allocationsNicholas Mc Guire1-1/+5
2019-01-10tools headers powerpc: Remove unistd.hRavi Bangoria2-405/+0
2019-01-10perf powerpc: Rework syscall table generationRavi Bangoria3-14/+450
2019-01-10drm: Fix documentation generation for DP_DPCD_QUIRK_NO_PSRJosé Roberto de Souza1-1/+1
2019-01-10drm/i915: init per-engine WAs for all enginesDaniele Ceraolo Spurio1-1/+2
2019-01-10drm/i915: Unwind failure on pinning the gen7 ppgttChris Wilson1-3/+12
2019-01-10drm/i915: Skip the ERR_PTR error stateChris Wilson3-13/+26
2019-01-10drm/i915: Disable PSR in Apple panelsJosé Roberto de Souza3-0/+15
2019-01-10Merge tag 'gvt-fixes-2019-01-09' of https://github.com/intel/gvt-linux into d...Jani Nikula2-22/+43
2019-01-10csky: fixup compile error with CPU 810.Guo Ren1-1/+1
2019-01-10ARM: dts: kirkwood: Fix polarity of GPIO fan linesLinus Walleij1-2/+2
2019-01-10arm64: dts: marvell: mcbin: fix PCIe reset signalBaruch Siach1-1/+1
2019-01-10arm64: dts: marvell: armada-ap806: reserve PSCI areaHeinrich Schuchardt1-0/+17
2019-01-10arm64: asm-prototypes: Fix fat-fingered typo in commentWill Deacon1-1/+1
2019-01-10mm/mmu_notifier: mm/rmap.c: Fix a mmu_notifier range bug in try_to_unmap_oneSean Christopherson1-2/+2
2019-01-10gpu/drm: Fix lock held when returning to user space.Tetsuo Handa2-4/+3
2019-01-10PM-runtime: Fix autosuspend_delay on 32bits archVincent Guittot1-2/+2
2019-01-10PM-runtime: Fix 'jiffies' in comments after switch to hrtimersLadislav Michl1-2/+5
2019-01-10rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is setIlya Dryomov1-5/+4
2019-01-10ARM: dts: da850-lcdk: Correct the sound card namePeter Ujfalusi1-1/+1
2019-01-10ARM: dts: da850-lcdk: Correct the audio codec regulatorsPeter Ujfalusi1-0/+36