aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
AgeCommit message (Expand)AuthorFilesLines
2021-12-12Merge tag 'char-misc-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-0/+13
2021-12-11Merge branch 'for-5.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds1-1/+1
2021-12-11Merge branch 'akpm' (patches from Andrew)Linus Torvalds1-1/+13
2021-12-10timers: implement usleep_idle_range()SeongJae Park1-1/+13
2021-12-10Merge tag 'pm-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds1-1/+1
2021-12-10Merge tag 'aio-poll-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-0/+26
2021-12-09percpu_ref: Replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+1
2021-12-09Merge tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net...Linus Torvalds6-28/+21
2021-12-09Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid...Linus Torvalds1-0/+5
2021-12-09wait: add wake_up_pollfree()Eric Biggers1-0/+26
2021-12-09bus: mhi: core: Add support for forced PM resumeLoic Poulain1-0/+13
2021-12-08Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfJakub Kicinski5-23/+15
2021-12-08PM: runtime: Fix pm_runtime_active() kerneldoc commentRafael J. Wysocki1-1/+1
2021-12-07net: phy: Remove unnecessary indentation in the comments of phy_deviceYanteng Si1-5/+6
2021-12-06Merge tag 'regulator-fix-v5.16-rc4' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds1-6/+8
2021-12-05Merge tag 'sched_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds1-2/+3
2021-12-03treewide: Add missing includes masked by cgroup -> bpf dependencyJakub Kicinski3-2/+2
2021-12-02bpf: Make CONFIG_DEBUG_INFO_BTF depend upon CONFIG_BPF_SYSCALLKumar Kartikeya Dwivedi1-4/+10
2021-12-02Merge tag 'net-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net...Linus Torvalds3-17/+21
2021-12-02HID: add hid_is_usb() function to make it simpler for USB detectionGreg Kroah-Hartman1-0/+5
2021-12-02sched/cputime: Fix getrusage(RUSAGE_THREAD) with nohz_fullFrederic Weisbecker1-2/+3
2021-12-01net: annotate data-races on txq->xmit_lock_ownerEric Dumazet1-6/+13
2021-12-01kprobes: Limit max data_size of the kretprobe instancesMasami Hiramatsu1-0/+2
2021-11-30net/mlx5: Fix access to a non-supported registerAya Levin1-1/+4
2021-11-30bpf: Make sure bpf_disable_instrumentation() is safe vs preemption.Sebastian Andrzej Siewior2-17/+2
2021-11-29siphash: use _unaligned version by defaultArnd Bergmann1-10/+4
2021-11-28Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds1-2/+0
2021-11-26Merge tag 'net-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net...Linus Torvalds1-0/+1
2021-11-26Merge tag 'acpi-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ra...Linus Torvalds1-7/+0
2021-11-26net: ptp: add a definition for the UDP port for IEEE 1588 general messagesVladimir Oltean1-0/+1
2021-11-25Merge tag 'folio-5.16b' of git://git.infradead.org/users/willy/pagecacheLinus Torvalds5-18/+88
2021-11-24Revert "virtio_ring: validate used buffer length"Michael S. Tsirkin1-2/+0
2021-11-24Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid...Linus Torvalds2-2/+16
2021-11-23ACPI: Make acpi_node_get_parent() localSakari Ailus1-7/+0
2021-11-20Merge branch 'akpm' (patches from Andrew)Linus Torvalds3-1/+28
2021-11-20Merge tag 'pinctrl-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2-160/+9
2021-11-20hugetlb: fix hugetlb cgroup refcounting during mremapBui Quang Minh1-0/+12
2021-11-20shm: extend forced shm destroy to support objects from several IPC nsesAlexander Mikhalitsyn2-1/+16
2021-11-19Merge branch 'SA_IMMUTABLE-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/s...Linus Torvalds1-0/+1
2021-11-19signal: Replace force_fatal_sig with force_exit_sig when in doubtEric W. Biederman1-0/+1
2021-11-18Merge tag 'net-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/net...Linus Torvalds5-6/+23
2021-11-18mm: Add functions to zero portions of a folioMatthew Wilcox (Oracle)1-3/+41
2021-11-18Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2-12/+1
2021-11-18Merge tag 'printk-for-5.16-fixup' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-1/+4
2021-11-18regulator: Update protection IRQ helper docsMatti Vaittinen1-6/+8
2021-11-18page_pool: Revert "page_pool: disable dma mapping support..."Yunsheng Lin1-1/+12
2021-11-18Merge branch 'rework/printk_safe-removal' into for-linusPetr Mladek1-0/+4
2021-11-18Merge branch 'kvm-5.16-fixes' into kvm-masterPaolo Bonzini2-12/+1
2021-11-18KVM: Kill kvm_map_gfn() / kvm_unmap_gfn() and gfn_to_pfn_cacheDavid Woodhouse2-12/+1
2021-11-17fs: Rename AS_THP_SUPPORT and mapping_thp_supportMatthew Wilcox (Oracle)1-6/+6
2021-11-17fs: Remove FS_THP_SUPPORTMatthew Wilcox (Oracle)2-1/+16
2021-11-17mm: Remove folio_test_singleMatthew Wilcox (Oracle)1-6/+0
2021-11-17mm: Rename folio_test_multi to folio_test_largeMatthew Wilcox (Oracle)1-1/+7
2021-11-17Add linux/cacheflush.hMatthew Wilcox (Oracle)2-2/+19
2021-11-17net: virtio_net_hdr_to_skb: count transport header in UFOJonathan Davies1-1/+6
2021-11-17bpf, x86: Fix "no previous prototype" warningBjörn Töpel1-0/+1
2021-11-17Merge tag 'mlx5-fixes-2021-11-16' of git://git.kernel.org/pub/scm/linux/kerne...David S. Miller1-2/+2
2021-11-16Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfJakub Kicinski1-1/+2
2021-11-16net/mlx5: E-Switch, Fix resetting of encap mode when entering switchdevPaul Blakey1-2/+2
2021-11-15bpf: Fix toctou on read-only map's constant scalar trackingDaniel Borkmann1-1/+2
2021-11-16Remove unused header <linux/sdb.h>Jonathan Corbet1-160/+0
2021-11-16ACPI: Add stubs for wakeup handler functionsMario Limonciello1-0/+9
2021-11-15printk: Remove printk.h inclusion in percpu.hAndy Shevchenko1-1/+0
2021-11-15net: Clean up some inconsistent indentingJiapeng Chong1-1/+1
2021-11-14Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/ro...Linus Torvalds1-1/+1
2021-11-14tracing: Add length protection to histogram string copiesSteven Rostedt (VMware)1-1/+1
2021-11-14Merge tag 'timers-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds1-0/+2
2021-11-14Merge tag 'irq-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2-1/+3
2021-11-14Merge tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2-2/+2
2021-11-14net,lsm,selinux: revert the security_sctp_assoc_established() hookPaul Moore3-14/+0
2021-11-13Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linuxLinus Torvalds3-981/+2780
2021-11-13Merge tag 'block-5.16-2021-11-13' of git://git.kernel.dk/linux-blockLinus Torvalds1-3/+3
2021-11-13Merge tag 'ceph-for-5.16-rc1' of git://github.com/ceph/ceph-clientLinus Torvalds2-11/+10
2021-11-13Merge tag 'netfs-folio-20211111' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2-6/+39
2021-11-13Merge tag 'selinux-pr-20211112' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds3-14/+0
2021-11-13Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2-2/+11
2021-11-13Merge tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390...Linus Torvalds1-0/+1
2021-11-12Merge tag 'pwm/for-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds1-0/+13
2021-11-12Merge tag 'drm-next-2021-11-12' of git://anongit.freedesktop.org/drm/drmLinus Torvalds2-2/+25
2021-11-12Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2-25/+0
2021-11-12Merge tag 'rtc-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/abellon...Linus Torvalds1-0/+3
2021-11-12Merge tag 'libata-5.16-rc1-p2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-1/+2
2021-11-12net,lsm,selinux: revert the security_sctp_assoc_established() hookPaul Moore3-14/+0
2021-11-12BackMerge tag 'v5.15' into drm-nextDave Airlie5-6/+34
2021-11-11Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds1-0/+1
2021-11-12libata: add horkage for missing Identify Device logDamien Le Moal1-0/+1
2021-11-11Merge tag 'kcsan.2021.11.11a' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds1-0/+3
2021-11-11Merge branch 'akpm' (patches from Andrew)Linus Torvalds2-7/+6
2021-11-11HID: intel-ish-hid: fix module device-id handlingArnd Bergmann2-2/+4
2021-11-11Revert "PCI: Remove struct pci_dev->driver"Bjorn Helgaas1-0/+1
2021-11-11Merge tag 'net-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/net...Linus Torvalds9-12/+83
2021-11-11Merge tag 'usb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds1-2/+0
2021-11-11mm/migrate.c: remove MIGRATE_PFN_LOCKEDAlistair Popple1-1/+0
2021-11-11mm/page_owner.c: modify the type of argument "order" in some functionsYixuan Cao1-6/+6
2021-11-11Merge branch 'kvm-sev-move-context' into kvm-masterPaolo Bonzini1-2/+10
2021-11-11KVM: generalize "bugged" VM to "dead" VMPaolo Bonzini1-2/+10
2021-11-11Merge branch 'kvm-guest-sev-migration' into kvm-masterPaolo Bonzini1-0/+1
2021-11-11EFI: Introduce the new AMD Memory Encryption GUID.Ashish Kalra1-0/+1
2021-11-11preempt: Restore preemption model selection configsValentin Schneider2-2/+2
2021-11-11PCI/MSI: Deal with devices lying about their MSI mask capabilityMarc Zyngier1-0/+2
2021-11-11PCI/MSI: Move non-mask check back into low level accessorsThomas Gleixner1-1/+1
2021-11-11libata: fix read log timeout valueDamien Le Moal1-1/+1
2021-11-10Merge tag 'nfsd-5.16' of git://linux-nfs.org/~bfields/linuxLinus Torvalds3-36/+34
2021-11-10Merge tag 'nfs-for-5.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds6-373/+58
2021-11-10Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2-0/+4
2021-11-10Merge tag 'pidfd.v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/brau...Linus Torvalds1-0/+1
2021-11-10netfs, 9p, afs, ceph: Use foliosDavid Howells1-6/+6
2021-11-10folio: Add a function to get the host inode for a folioDavid Howells1-0/+14
2021-11-10folio: Add a function to change the private data attached to a folioDavid Howells1-0/+19
2021-11-10Merge tag 'pm-5.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ra...Linus Torvalds1-4/+16
2021-11-10Merge tag 'acpi-5.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2-0/+23
2021-11-10Merge tag 'dmaengine-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-2/+0
2021-11-10Merge tag 'tag-chrome-platform-for-v5.16' of git://git.kernel.org/pub/scm/lin...Linus Torvalds1-2/+5
2021-11-10Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6...Linus Torvalds1-1/+1
2021-11-10Merge tag 'libnvdimm-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-2/+0
2021-11-10Merge tag 'linux-watchdog-5.16-rc1' of git://www.linux-watchdog.org/linux-wat...Linus Torvalds1-18/+0
2021-11-10Merge tag 'rproc-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/remo...Linus Torvalds1-12/+0
2021-11-10Merge tag 'rpmsg-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/remo...Linus Torvalds1-1/+1
2021-11-10printk: restore flushing of NMI buffers on remote CPUs after NMI backtracesNicholas Piggin1-0/+4
2021-11-10Merge branches 'pm-opp' and 'pm-cpufreq'Rafael J. Wysocki1-4/+16
2021-11-10mod_devicetable: fix kdocs for ishtp_device_idThomas Weißschuh1-2/+1
2021-11-09block: add __must_check for *add_disk*() callersLuis Chamberlain1-3/+3
2021-11-09Merge tag 'for-5.16/block-2021-11-09' of git://git.kernel.dk/linux-blockLinus Torvalds1-0/+1
2021-11-09Merge tag 'for-5.16/bdev-size-2021-11-09' of git://git.kernel.dk/linux-blockLinus Torvalds1-1/+1
2021-11-09Merge tag '9p-for-5.16-rc1' of git://github.com/martinetd/linuxLinus Torvalds1-1/+1
2021-11-09Merge branch 'akpm' (patches from Andrew)Linus Torvalds23-71/+179
2021-11-09seq_file: fix passing wrong private dataMuchun Song1-1/+1
2021-11-09seq_file: move seq_escape() to a headerAndy Shevchenko1-1/+16
2021-11-09signal: remove duplicate include in signal.hYe Guojin1-1/+0
2021-11-09crash_dump: remove duplicate include in crash_dump.hYe Guojin1-2/+0
2021-11-09crash_dump: fix boolreturn.cocci warningChangcheng Deng1-1/+1
2021-11-09sections: provide internal __is_kernel() and __is_kernel_text() helperKefeng Wang1-2/+2
2021-11-09sections: move is_kernel_inittext() into sections.hKefeng Wang2-9/+0
2021-11-09sections: move and rename core_kernel_data() to is_kernel_core_data()Kefeng Wang1-1/+0
2021-11-09kallsyms: fix address-checks for kernel related rangeKefeng Wang1-3/+3
2021-11-09kallsyms: remove arch specific text and data checkKefeng Wang1-2/+1
2021-11-09include/linux/string_helpers.h: add linux/string.h for strlen()Lucas De Marchi1-0/+1
2021-11-09lib, stackdepot: add helper to print stack entries into bufferImran Khan1-0/+3
2021-11-09lib, stackdepot: add helper to print stack entriesImran Khan1-0/+2
2021-11-09linux/container_of.h: switch to static_assertRasmus Villemoes1-6/+6
2021-11-09kernel.h: split out instruction pointer accessorsStephen Rothwell3-4/+10
2021-11-09include/linux/generic-radix-tree.h: replace kernel.h with the necessary inclu...Andy Shevchenko1-1/+2
2021-11-09include/linux/radix-tree.h: replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+3
2021-11-09include/linux/sbitmap.h: replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+10
2021-11-09include/linux/delay.h: replace kernel.h with the necessary inclusionsAndy Shevchenko2-1/+2
2021-11-09include/linux/plist.h: replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+4
2021-11-09include/linux/llist.h: replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+3
2021-11-09include/linux/list.h: replace kernel.h with the necessary inclusionsAndy Shevchenko1-1/+3
2021-11-09kernel.h: split out container_of() and typeof_member() macrosAndy Shevchenko2-32/+41
2021-11-09kernel.h: drop unneeded <linux/kernel.h> inclusion from other headersAndy Shevchenko4-3/+1
2021-11-09proc/vmcore: convert oldmem_pfn_is_ram callback to more generic vmcore callbacksDavid Hildenbrand1-3/+23
2021-11-09mm,hugetlb: remove mlock ulimit for SHM_HUGETLBzhangyiru1-4/+2
2021-11-09vfs: keep inodes with page cache off the inode shrinker LRUJohannes Weiner2-0/+51
2021-11-09blk-mq: add one API for waiting until quiesce is doneMing Lei1-0/+1
2021-11-09HID: intel-ish-hid: add support for MODULE_DEVICE_TABLE()Thomas Weißschuh1-0/+13
2021-11-08lib: zstd: Upgrade to latest upstream zstd version 1.4.10Nick Terrell3-1049/+2408
2021-11-08lib: zstd: Add kernel-specific APINick Terrell2-980/+1420
2021-11-09bpf, sockmap: Use stricter sk state checks in sk_lookup_assignJohn Fastabend1-0/+12
2021-11-08Merge tag 'mfd-next-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/le...Linus Torvalds6-738/+72
2021-11-08Merge tag 'gpio-updates-for-v5.16' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2-1/+15
2021-11-08Merge tag 'cxl-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl...Linus Torvalds2-2/+3
2021-11-08Merge tag 'mtd/for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd...Linus Torvalds1-2/+0
2021-11-08PCI: Export pci_dev_lock()Niklas Schnelle1-0/+1
2021-11-08arm64: Track no early_pgtable_alloc() for kmemleakQian Cai1-1/+1
2021-11-08libceph, ceph: move ceph_osdc_copy_from() into cephfs codeLuís Henriques1-11/+8
2021-11-08ceph: don't rely on error_string to validate blocklisted session.Kotresh HR1-0/+2
2021-11-07Merge tag 'compiler-attributes-for-linus-v5.16' of git://github.com/ojeda/linuxLinus Torvalds2-2/+7
2021-11-07Merge tag 'spi-nor/for-5.16' into mtd/nextMiquel Raynal28-316/+110
2021-11-06Merge tag 'fsnotify_for_v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds3-26/+137
2021-11-06Merge tag 'pci-v5.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds4-16/+12
2021-11-06Merge branch 'akpm' (patches from Andrew)Linus Torvalds35-247/+571
2021-11-06mm/damon: remove return value from before_terminate callbackChangbin Du1-1/+1
2021-11-06mm/damon: simplify stop mechanismChangbin Du1-1/+0
2021-11-06mm/damon/dbgfs: add adaptive_targets list check before enable monitor_onXin Hao1-0/+1
2021-11-06mm/damon/schemes: activate schemes based on a watermarks mechanismSeongJae Park1-1/+51
2021-11-06mm/damon/vaddr,paddr: support pageout prioritizationSeongJae Park1-0/+4
2021-11-06mm/damon/schemes: prioritize regions within the quotasSeongJae Park1-0/+26
2021-11-06mm/damon/schemes: implement time quotaSeongJae Park1-5/+20
2021-11-06mm/damon/schemes: skip already charged targets and regionsSeongJae Park1-0/+5
2021-11-06mm/damon/schemes: implement size quota for schemes application speed controlSeongJae Park1-4/+32
2021-11-06mm/damon/paddr: support the pageout schemeSeongJae Park1-0/+2
2021-11-06mm/damon: implement primitives for physical address space monitoringSeongJae Park1-0/+10
2021-11-06mm/damon/schemes: implement statistics featureSeongJae Park1-1/+9
2021-11-06mm/damon/vaddr: support DAMON-based Operation SchemesSeongJae Park1-0/+2
2021-11-06mm/damon/core: implement DAMON-based Operation Schemes (DAMOS)SeongJae Park1-0/+66
2021-11-06mm/damon/core: account age of target regionsSeongJae Park1-0/+10
2021-11-06include/linux/damon.h: fix kernel-doc comments for 'damon_callback'SeongJae Park1-3/+3
2021-11-06kfence: always use static branches to guard kfence_alloc()Marco Elver1-10/+11
2021-11-06stacktrace: move filter_irq_stacks() to kernel/stacktrace.cMarco Elver2-2/+1
2021-11-06include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.hMianhan Liu2-1/+2
2021-11-06mm: remove HARDENED_USERCOPY_FALLBACKStephen Kitt1-2/+0
2021-11-06mm/highmem: remove deprecated kmap_atomicIra Weiny1-14/+14
2021-11-06memblock: add MEMBLOCK_DRIVER_MANAGED to mimic IORESOURCE_SYSRAM_DRIVER_MANAGEDDavid Hildenbrand1-2/+14
2021-11-06memblock: allow to specify flags with memblock_add_node()David Hildenbrand2-2/+3
2021-11-06memblock: improve MEMBLOCK_HOTPLUG documentationDavid Hildenbrand1-1/+5
2021-11-06mm/memory_hotplug: remove stale function declarationsDavid Hildenbrand1-3/+0
2021-11-06mm/memory_hotplug: remove HIGHMEM leftoversDavid Hildenbrand1-1/+0
2021-11-06mm/memory_hotplug: remove CONFIG_MEMORY_HOTPLUG_SPARSEDavid Hildenbrand2-16/+12
2021-11-06mm: migrate: make demotion knob depend on migrationYang Shi2-4/+4
2021-11-06mm/migrate: de-duplicate migrate_reason stringsJohn Hubbard2-18/+14