aboutsummaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Expand)AuthorFilesLines
2017-07-02Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds7-16/+33
2017-07-02Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds1-4/+4
2017-07-01Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds6-10/+15
2017-06-30x86/intel_rdt: Fix memory leak on mount failureVikas Shivappa1-1/+3
2017-06-30Merge tag 'powerpc-4.12-8' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds1-7/+1
2017-06-30Merge tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds1-1/+1
2017-06-30x86/boot/KASLR: Fix kexec crash due to 'virt_addr' calculation bugBaoquan He3-7/+2
2017-06-30x86/boot/KASLR: Add checking for the offset of kernel virtual address randomi...Baoquan He1-0/+2
2017-06-30MIPS: Avoid accidental raw backtraceJames Hogan1-0/+2
2017-06-30MIPS: Perform post-DMA cache flushes on systems with MAARsPaul Burton1-5/+18
2017-06-30MIPS: Fix IRQ tracing & lockdep when reschedulingPaul Burton1-0/+3
2017-06-30MIPS: pm-cps: Drop manual cache-line alignment of ready_countPaul Burton1-8/+1
2017-06-29ARM: 8685/1: ensure memblock-limit is pmd-alignedDoug Berger1-4/+4
2017-06-29perf/x86/intel/uncore: Fix wrong box pointer checkKan Liang1-1/+1
2017-06-28arch: remove unused macro/function thread_saved_pc()Tobias Klauser41-270/+0
2017-06-28MIPS: math-emu: Handle zero accumulator case in MADDF and MSUBF separatelyAleksandar Markovic2-2/+8
2017-06-27MIPS: head: Reorder instructions missing a delay slotKarl Beldan1-1/+1
2017-06-27Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds3-2/+4
2017-06-26Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds1-6/+1
2017-06-26powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user()Michael Ellerman1-7/+1
2017-06-26x86/mm/hotplug: Fix BUG_ON() after hot-remove by not freeing PUDJérôme Glisse1-1/+7
2017-06-25Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds1-2/+1
2017-06-25Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2-3/+3
2017-06-25Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds1-2/+2
2017-06-24x86/mshyperv: Remove excess #includes from mshyperv.hThomas Gleixner1-2/+1
2017-06-23Merge tag 'powerpc-4.12-7' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds7-50/+166
2017-06-23powerpc/64: Initialise thread_info for emergency stacksNicholas Piggin1-3/+28
2017-06-22KVM: x86: fix singlestepping over syscallPaolo Bonzini3-30/+34
2017-06-22Merge tag 'kvm-s390-master-4.12-2' of git://git.kernel.org/pub/scm/linux/kern...Radim Krčmář1-9/+6
2017-06-22powerpc/powernv/npu-dma: Add explicit flush when sending an ATSDAlistair Popple1-29/+65
2017-06-22KVM: s390: gaccess: fix real-space designation asce handling for gmap shadowsHeiko Carstens1-9/+6
2017-06-22perf/x86/intel: Add 1G DTLB load/store miss support for SKLKan Liang1-2/+2
2017-06-20KVM: MIPS: Fix maybe-uninitialized build failureJames Cowgill1-1/+5
2017-06-20Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Radim Krčmář3-20/+118
2017-06-20arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAWWill Deacon2-3/+3
2017-06-19mm: larger stack guard gap, between vmasHugh Dickins16-27/+30
2017-06-19Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds5-13/+10
2017-06-18Merge tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kern...Olof Johansson4-7/+8
2017-06-18Merge tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson1-6/+2
2017-06-19Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds8-31/+34
2017-06-18Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds4-4/+8
2017-06-17Merge tag 'powerpc-4.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds5-10/+13
2017-06-16powerpc/perf: Fix oops when kthread execs user processRavi Bangoria1-1/+2
2017-06-16powerpc/64s: Handle data breakpoints in Radix modeNaveen N. Rao1-4/+7
2017-06-16powerpc/kprobes: Skip livepatch_handler() for jprobesNaveen N. Rao3-5/+41
2017-06-16powerpc/ftrace: Pass the correct stack pointer for DYNAMIC_FTRACE_WITH_REGSNaveen N. Rao1-8/+12
2017-06-16powerpc/kprobes: Pause function_graph tracing during jprobes handlingNaveen N. Rao1-0/+11
2017-06-16powerpc/debug: Add missing warn flag to WARN_ON's non-builtin pathAlexey Kardashevskiy1-1/+1
2017-06-16KVM: PPC: Book3S HV: Ignore timebase offset on POWER9 DD1Paul Mackerras1-0/+8
2017-06-16KVM: PPC: Book3S HV: Save/restore host values of debug registersPaul Mackerras1-13/+32
2017-06-15iommu/vt-d: Correctly disable Intel IOMMU force onShaohua Li1-1/+1
2017-06-15powerpc/xive: Fix offset for store EOI MMIOsBenjamin Herrenschmidt3-8/+10
2017-06-15MIPS: .its targets depend on vmlinuxPaul Burton1-5/+5
2017-06-15MIPS: Fix bnezc/jialc return address calculationPaul Burton1-1/+3
2017-06-15Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds1-2/+5
2017-06-15KVM: PPC: Book3S HV: Preserve userspace HTM state properlyPaul Mackerras1-0/+21
2017-06-15KVM: PPC: Book3S HV: Restore critical SPRs to host values on guest exitPaul Mackerras2-3/+17
2017-06-14s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPLHeiko Carstens1-6/+1
2017-06-14powerpc/npu-dma: Remove spurious WARN_ON when a PCI device has no of_nodeAlistair Popple1-1/+2
2017-06-13x86/mm: Disable 1GB direct mappings when disabling 2MB mappingsVlastimil Babka1-3/+3
2017-06-13Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensaLinus Torvalds7-20/+16
2017-06-13Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds6-27/+100
2017-06-13KVM: PPC: Book3S HV: Context-switch EBB registers properlyPaul Mackerras1-0/+15
2017-06-12x86/debug: Handle early WARN_ONs properPeter Zijlstra3-1/+5
2017-06-12ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzeroVladimir Murzin1-1/+1
2017-06-12ARM: 8681/1: make VMSPLIT_3G_OPT depends on !ARM_LPAEYisheng Xie1-0/+1
2017-06-12ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nopArd Biesheuvel1-1/+2
2017-06-11Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds5-19/+0
2017-06-11Merge tag 'hexagon-for-linus-v4.12-rc5' of git://git.kernel.org/pub/scm/linux...Linus Torvalds1-3/+2
2017-06-11Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds13-32/+40
2017-06-11KVM: async_pf: avoid async pf injection when in guest modeWanpeng Li3-4/+7
2017-06-10hexagon: Use raw_copy_to_userGuenter Roeck1-3/+2
2017-06-10Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2-0/+4
2017-06-09Merge tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-16/+16
2017-06-09Merge tag 'powerpc-4.12-5' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds16-50/+109
2017-06-09Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds9-8/+35
2017-06-09security/keys: add CONFIG_KEYS_COMPAT to KconfigBilal Amarni5-19/+0
2017-06-08Merge tag 'kvm-s390-master-4.12-1' of git://git.kernel.org/pub/scm/linux/kern...Paolo Bonzini3-5/+2
2017-06-08s390: update defconfigMartin Schwidefsky5-21/+87
2017-06-08MIPS: kprobes: flush_insn_slot should flush only if probe initialisedMarcin Nowakowski1-1/+2
2017-06-08KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulationWanpeng Li1-9/+11
2017-06-08Merge tag 'kvm-arm-for-v4.12-rc5-take2' of git://git.kernel.org/pub/scm/linux...Paolo Bonzini4-12/+18
2017-06-08MIPS: ftrace: fix init functions tracingMarcin Nowakowski1-19/+5
2017-06-08MIPS: mm: adjust PKMAP locationMarcin Nowakowski1-1/+6
2017-06-08MIPS: highmem: ensure that we don't use more than one page for PTEsMarcin Nowakowski1-0/+5
2017-06-08MIPS: mm: fixed mappings: correct initialisationMarcin Nowakowski1-3/+3
2017-06-08MIPS: perf: Remove incorrect odd/even counter handling for I6400Marcin Nowakowski1-1/+5
2017-06-08powerpc/book3s64: Move PPC_DT_CPU_FTRs and enable it by defaultMichael Ellerman2-11/+11
2017-06-08powerpc/mm/4k: Limit 4k page size config to 64TB virtual address spaceAneesh Kumar K.V4-16/+15
2017-06-08x86/microcode/intel: Clear patch pointer before jettisoning the initrdDominik Brodowski1-0/+3
2017-06-07bpf, arm64: use separate register for state in stxrDaniel Borkmann1-2/+5
2017-06-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds1-0/+6
2017-06-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds17-116/+201
2017-06-06sparc64: delete old wrap codePavel Tatashin6-45/+1
2017-06-06sparc64: new context wrapPavel Tatashin1-27/+54
2017-06-06sparc64: add per-cpu mm of secondary contextsPavel Tatashin2-2/+4
2017-06-06sparc64: redefine first versionPavel Tatashin2-4/+4
2017-06-06sparc64: combine activate_mm and switch_mmPavel Tatashin1-20/+1
2017-06-06sparc64: reset mm cpumask after wrapPavel Tatashin1-0/+2
2017-06-06sparc/mm/hugepages: Fix setup_hugepagesz for invalid values.Liam R. Howlett1-1/+2
2017-06-06sparc: Machine description indices can varyJames Clarke2-4/+65
2017-06-06sparc64: mm: fix copy_tsb to correctly copy huge page TSBsMike Kravetz2-6/+12
2017-06-06arch/sparc: support NR_CPUS = 4096Jane Chu2-6/+15
2017-06-06arm: KVM: Allow unaligned accesses at HYPMarc Zyngier1-3/+2
2017-06-06arm64: KVM: Allow unaligned accesses at EL2Marc Zyngier1-2/+3
2017-06-06arm64: KVM: Preserve RES1 bits in SCTLR_EL2Marc Zyngier2-4/+10
2017-06-06KVM: nVMX: Fix exception injectionWanpeng Li1-1/+1
2017-06-06kvm: async_pf: fix rcu_irq_enter() with irqs enabledPaolo Bonzini1-1/+1
2017-06-06powerpc/perf: Fix Power9 test_adder fieldsMadhavan Srinivasan1-2/+2
2017-06-06powerpc/numa: Fix percpu allocations to be NUMA awareMichael Ellerman2-2/+16
2017-06-06powerpc/kernel: Initialize load_tm on task creationBreno Leitao1-0/+1
2017-06-05xtensa: don't use linux IRQ #0Max Filippov4-13/+11
2017-06-05xtensa: reduce double exception literal reservationMax Filippov1-3/+3
2017-06-05sparc64: Add __multi3 for gcc 7.x and later.David S. Miller2-0/+36
2017-06-05Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds4-13/+15
2017-06-05ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-MArd Biesheuvel2-10/+11
2017-06-05ARM: 8676/1: NOMMU: provide pgprot_device() macroVladimir Murzin1-0/+1
2017-06-05x86/cpu/cyrix: Add alternative Device ID of Geode GX1 SoCChristian Sünkenberg1-0/+1
2017-06-05powerpc/kernel: Fix FP and vector register restorationBreno Leitao1-0/+2
2017-06-03arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCUChen-Yu Tsai1-2/+3
2017-06-03ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCUChen-Yu Tsai1-2/+3
2017-06-02Merge branch 'akpm' (patches from Andrew)Linus Torvalds1-0/+6
2017-06-02frv: declare jiffies to be located in the .data sectionMatthias Kaehlcke1-0/+6
2017-06-02Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6...Linus Torvalds2-4/+6
2017-06-02Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds3-15/+12
2017-06-02Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds3-10/+78
2017-06-02ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementationLorenzo Pieralisi1-3/+3
2017-06-01Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into fixesOlof Johansson55-237/+449
2017-06-01Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/...Olof Johansson1-0/+1
2017-06-01ARM: dts: versatile: use #include "..." to include local DTMasahiro Yamada1-1/+1
2017-06-01ARM: dts: imx6ul-14x14-evk: Add ksz8081 phy propertiesLeonard Crestez1-0/+6
2017-06-01Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds4-102/+83
2017-06-01sparc64: Fix build warnings with gcc 7.David S. Miller1-1/+1
2017-06-01Revert "x86/PAT: Fix Xorg regression on CPUs that don't support PAT"Ingo Molnar1-6/+3
2017-06-01powerpc/64: Reclaim CPU_FTR_SUBCOREMichael Ellerman3-4/+8
2017-06-01powerpc/hotplug-mem: Fix missing endian conversion of aa_indexMichael Bringmann1-0/+2
2017-06-01powerpc/sysdev/simple_gpio: Fix oops in gpio save_regs functionChristophe Leroy1-1/+2
2017-06-01powerpc/spufs: Fix coredump of SPU contextsMichael Ellerman1-0/+2
2017-06-01powerpc/64s: Add dt_cpu_ftrs boot time setup optionNicholas Piggin2-14/+48
2017-06-01KVM: x86: Fix nmi injection failure when vcpu got blockedZhuangYanying1-2/+5
2017-06-01KVM: SVM: do not zero out segment attributes if segment is unusable or not pr...Roman Pen1-13/+11
2017-05-31KVM: s390: fix ais handling vs cpu modelChristian Borntraeger3-5/+2
2017-05-30KVM: SVM: ignore type when setting segment registersGioh Kim1-1/+1
2017-05-30KVM: nVMX: fix nested_vmx_check_vmptr failure paths under debuggingRadim Krčmář1-83/+57
2017-05-30arm: dma-mapping: Reset the device's dma_opsSricharan R1-15/+10
2017-05-30ARM: dma-mapping: Don't tear down third-party mappingsLaurent Pinchart2-1/+6
2017-05-29kthread: fix boot hang (regression) on MIPS/OpenRISCVegard Nossum2-3/+0
2017-05-29ARM: at91: select CONFIG_ARM_CPU_SUSPENDArnd Bergmann1-0/+1
2017-05-29x86/debug/32: Convert a smp_processor_id() call to raw to avoid DEBUG_PREEMPT...Borislav Petkov1-1/+1
2017-05-29x86/microcode/AMD: Change load_microcode_amd()'s param to bool to fix preempt...Borislav Petkov1-8/+8
2017-05-29KVM: PPC: Book3S HV: Cope with host using large decrementer modePaul Mackerras2-7/+28
2017-05-28x86/efi: Correct EFI identity mapping under 'efi=old_map' when KASLR is enabledBaoquan He1-8/+71
2017-05-28x86/efi: Disable runtime services on kexec kernel if booted with efi=old_mapSai Praneeth1-2/+4
2017-05-28efi: Don't issue error message when booted under XenJuergen Gross1-0/+3
2017-05-27Merge tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds5-5/+11
2017-05-27Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds9-37/+81
2017-05-27Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2-7/+7
2017-05-27Merge tag 'trace-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds3-7/+24
2017-05-26x86/ftrace: Make sure that ftrace trampolines are not RWXThomas Gleixner1-6/+14
2017-05-26x86/mm/ftrace: Do not bug in early boot on irqs_disabled in cpu_flush_range()Steven Rostedt (VMware)1-1/+1
2017-05-26kprobes/x86: Fix to set RWX bits correctly before releasing trampolineMasami Hiramatsu1-0/+9
2017-05-26arch/sparc: increase CONFIG_NODES_SHIFT on SPARC64 to 5Jane Chu1-2/+6
2017-05-26KVM: x86: Fix virtual wire modeJan H. Schönherr1-1/+2
2017-05-26KVM: nVMX: Fix handling of lmsw instructionJan H. Schönherr1-2/+5
2017-05-26KVM: X86: Fix preempt the preemption timer cancelWanpeng Li1-0/+2
2017-05-26ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0Enric Balletbo i Serra1-4/+0
2017-05-26ARM: dts: am335x-sl50: Fix card detect pin for mmc1Enric Balletbo i Serra1-2/+2
2017-05-26x86/timers: Move simple_udelay_calibration past init_hypervisor_platformJan Kiszka1-2/+2
2017-05-26ARM: dts: keystone-k2l: fix broken Ethernet due to disabled OSRMurali Karicheri2-2/+10
2017-05-25Merge tag 'arm-soc/for-4.12/devicetree-fixes-2' of http://github.com/Broadcom...Olof Johansson1-0/+5
2017-05-25arm64: defconfig: enable some core options for 64bit Rockchip socsHeiko Stuebner1-0/+10
2017-05-25Merge tag 'davinci-fixes-for-v4.12' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson1-1/+6
2017-05-25ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure pathTimmy Li1-1/+3
2017-05-25powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructionsNicholas Piggin2-1/+4
2017-05-25powerpc/spufs: Fix hash faults for kernel regionsJeremy Kerr1-1/+3
2017-05-25powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=NMichael Neuling1-0/+2
2017-05-25powerpc/powernv/npu-dma.c: Fix opal_npu_destroy_context() callAlistair Popple1-3/+2
2017-05-24arm64: marvell: dts: fix interrupts in 7k/8k crypto nodesAntoine Tenart2-4/+2
2017-05-24x86/alternatives: Prevent uninitialized stack byte read in apply_alternatives()Mateusz Jurczyk1-2/+7
2017-05-24x86/PAT: Fix Xorg regression on CPUs that don't support PATMikulas Patocka1-3/+6
2017-05-24KVM: arm/arm64: Fix isues with GICv2 on GICv3 migrationChristoffer Dall1-5/+5
2017-05-24x86/watchdog: Fix Kconfig help text file path reference to lockup watchdog do...Benjamin Peterson1-1/+1
2017-05-24x86/build: Permit building with old make versionsJan Kiszka1-1/+1
2017-05-24x86/unwind: Add end-of-stack check for ftrace handlersJosh Poimboeuf1-9/+40
2017-05-24Revert "x86/entry: Fix the end of the stack for newly forked tasks"Josh Poimboeuf2-18/+23
2017-05-23ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and c...Sudeep Holla1-3/+3
2017-05-23arm64: dts: hikey: Fix WiFi supportUlf Hansson1-15/+11
2017-05-23arm64: dts: hi6220: Move board data from the dwmmc nodes to hikey dtsUlf Hansson2-20/+22
2017-05-23arm64: dts: hikey: Add the SYS_5V and the VDD_3V3 regulatorsUlf Hansson1-1/+21
2017-05-23arm64: dts: hi6220: Move the fixed_5v_hub regulator to the hikey dtsUlf Hansson2-11/+11
2017-05-23arm64: dts: hikey: Add clock for the pmic mfdDaniel Lezcano1-0/+1
2017-05-21x86: fix 32-bit case of __get_user_asm_u64()Linus Torvalds1-3/+3
2017-05-21Clean up x86 unsafe_get/put_user() type handlingLinus Torvalds1-2/+3
2017-05-21x86/MCE: Export memory_error()Borislav Petkov2-7/+7
2017-05-21Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2-3/+5
2017-05-21osf_wait4(): fix infoleakAl Viro1-2/+4
2017-05-21fix unsafe_put_user()Al Viro1-1/+1
2017-05-21x86/boot: Use CROSS_COMPILE prefix for readelfRob Landley1-1/+1
2017-05-20arm64: allwinner: h5: Remove syslink to shared DTSIMaxime Ripard2-2/+1
2017-05-19Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds21-94/+231