Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
"The usual rocket-science from trivial tree for 4.15"

* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
MAINTAINERS: relinquish kconfig
MAINTAINERS: Update my email address
treewide: Fix typos in Kconfig
kfifo: Fix comments
init/Kconfig: Fix module signing document location
misc: ibmasm: Return error on error path
HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
MAINTAINERS: Correct path to uDraw PS3 driver
tracing: Fix doc mistakes in trace sample
tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
mm/huge_memory.c: fixup grammar in comment
lib/xz: Add fall-through comments to a switch statement

+62 -46
+4 -6
MAINTAINERS
··· 3472 3472 M: Julia Lawall <Julia.Lawall@lip6.fr> 3473 3473 M: Gilles Muller <Gilles.Muller@lip6.fr> 3474 3474 M: Nicolas Palix <nicolas.palix@imag.fr> 3475 - M: Michal Marek <mmarek@suse.com> 3475 + M: Michal Marek <michal.lkml@markovi.net> 3476 3476 L: cocci@systeme.lip6.fr (moderated for non-subscribers) 3477 3477 T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc 3478 3478 W: http://coccinelle.lip6.fr/ ··· 7448 7448 F: scripts/Makefile.kasan 7449 7449 7450 7450 KCONFIG 7451 - M: "Yann E. MORIN" <yann.morin.1998@free.fr> 7452 7451 L: linux-kbuild@vger.kernel.org 7453 - T: git git://gitorious.org/linux-kconfig/linux-kconfig 7454 - S: Maintained 7452 + S: Orphan 7455 7453 F: Documentation/kbuild/kconfig-language.txt 7456 7454 F: scripts/kconfig/ 7457 7455 ··· 7478 7480 7479 7481 KERNEL BUILD + files below scripts/ (unless maintained elsewhere) 7480 7482 M: Masahiro Yamada <yamada.masahiro@socionext.com> 7481 - M: Michal Marek <mmarek@suse.com> 7483 + M: Michal Marek <michal.lkml@markovi.net> 7482 7484 T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git 7483 7485 L: linux-kbuild@vger.kernel.org 7484 7486 S: Maintained ··· 13782 13784 M: Bastien Nocera <hadess@hadess.net> 13783 13785 L: linux-input@vger.kernel.org 13784 13786 S: Maintained 13785 - F: drivers/hid/hid-udraw.c 13787 + F: drivers/hid/hid-udraw-ps3.c 13786 13788 13787 13789 UFS FILESYSTEM 13788 13790 M: Evgeniy Dushistov <dushistov@mail.ru>
+1 -1
arch/alpha/Kconfig
··· 506 506 507 507 Generic kernels will auto-detect QEMU. But when building a 508 508 system-specific kernel, the assumption is that we want to 509 - elimiate as many runtime tests as possible. 509 + eliminate as many runtime tests as possible. 510 510 511 511 If unsure, say N. 512 512
+3 -3
arch/arc/Kconfig
··· 298 298 config ARC_MMU_V2 299 299 bool "MMU v2" 300 300 help 301 - Fixed the deficiency of v1 - possible thrashing in memcpy sceanrio 301 + Fixed the deficiency of v1 - possible thrashing in memcpy scenario 302 302 when 2 D-TLB and 1 I-TLB entries index into same 2way set. 303 303 304 304 config ARC_MMU_V3 ··· 371 371 bool "Enable FPU state persistence across context switch" 372 372 default n 373 373 help 374 - Double Precision Floating Point unit had dedictaed regs which 374 + Double Precision Floating Point unit had dedicated regs which 375 375 need to be saved/restored across context-switch. 376 376 Note that ARC FPU is overly simplistic, unlike say x86, which has 377 377 hardware pieces to allow software to conditionally save/restore, ··· 467 467 bool 468 468 469 469 config ARC_KVADDR_SIZE 470 - int "Kernel Virtaul Address Space size (MB)" 470 + int "Kernel Virtual Address Space size (MB)" 471 471 range 0 512 472 472 default "256" 473 473 help
+3 -3
arch/arm/mach-bcm/Kconfig
··· 23 23 help 24 24 This enables support for systems based on Broadcom IPROC architected SoCs. 25 25 The IPROC complex contains one or more ARM CPUs along with common 26 - core periperals. Application specific SoCs are created by adding a 26 + core peripherals. Application specific SoCs are created by adding a 27 27 uArchitecture containing peripherals outside of the IPROC complex. 28 28 Currently supported SoCs are Cygnus. 29 29 ··· 69 69 Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. 70 70 71 71 This is a network SoC line mostly used in home routers and 72 - wifi access points, it's internal name is Northstar. 73 - This inclused the following SoC: BCM53010, BCM53011, BCM53012, 72 + wifi access points, its internal name is Northstar. 73 + This includes the following SoC: BCM53010, BCM53011, BCM53012, 74 74 BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707, 75 75 BCM4708 and BCM4709. 76 76
+1 -1
arch/arm/plat-samsung/Kconfig
··· 278 278 help 279 279 Set the chunksize in Kilobytes of the CRC for checking memory 280 280 corruption over suspend and resume. A smaller value will mean that 281 - the CRC data block will take more memory, but wil identify any 281 + the CRC data block will take more memory, but will identify any 282 282 faults with better precision. 283 283 284 284 See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+1 -1
arch/arm64/Kconfig
··· 982 982 help 983 983 User Access Override (UAO; part of the ARMv8.2 Extensions) 984 984 causes the 'unprivileged' variant of the load/store instructions to 985 - be overriden to be privileged. 985 + be overridden to be privileged. 986 986 987 987 This option changes get_user() and friends to use the 'unprivileged' 988 988 variant of the load/store instructions. This ensures that user-space
-1
arch/mips/configs/db1xxx_defconfig
··· 77 77 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y 78 78 CONFIG_IPV6_PIMSM_V2=y 79 79 CONFIG_BRIDGE=y 80 - CONFIG_NETLINK_MMAP=y 81 80 CONFIG_NETLINK_DIAG=y 82 81 CONFIG_IRDA=y 83 82 CONFIG_IRLAN=y
+1 -1
arch/powerpc/platforms/Kconfig
··· 79 79 config PPC_SMP_MUXED_IPI 80 80 bool 81 81 help 82 - Select this opton if your platform supports SMP and your 82 + Select this option if your platform supports SMP and your 83 83 interrupt controller provides less than 4 interrupts to each 84 84 cpu. This will enable the generic code to multiplex the 4 85 85 messages on to one ipi.
+1 -1
arch/unicore32/Kconfig
··· 115 115 116 116 source "arch/unicore32/mm/Kconfig" 117 117 118 - comment "Floating poing support" 118 + comment "Floating point support" 119 119 120 120 config UNICORE_FPU_F64 121 121 def_bool y if !ARCH_FPGA
+1 -1
arch/xtensa/Kconfig
··· 224 224 then enter your normal kernel breakpoints once the MMU was mapped 225 225 to the kernel mappings (0XC0000000). 226 226 227 - This unfortunately doesn't work for U-Boot and likley also wont 227 + This unfortunately won't work for U-Boot and likely also wont 228 228 work for using KEXEC to have a hot kernel ready for doing a 229 229 KDUMP. 230 230
+2 -1
drivers/hid/hid-logitech-hidpp.c
··· 1957 1957 /* initialize with zero autocenter to get wheel in usable state */ 1958 1958 hidpp_ff_set_autocenter(dev, 0); 1959 1959 1960 - hid_info(hid, "Force feeback support loaded (firmware release %d).\n", version); 1960 + hid_info(hid, "Force feedback support loaded (firmware release %d).\n", 1961 + version); 1961 1962 1962 1963 return 0; 1963 1964 }
+1 -1
drivers/misc/ibmasm/event.c
··· 155 155 156 156 buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL); 157 157 if (!buffer) 158 - return 1; 158 + return -ENOMEM; 159 159 160 160 buffer->next_index = 0; 161 161 buffer->next_serial_number = 1;
+4 -2
drivers/misc/ibmasm/module.c
··· 94 94 snprintf(sp->dirname, IBMASM_NAME_SIZE, "%d", sp->number); 95 95 snprintf(sp->devname, IBMASM_NAME_SIZE, "%s%d", DRIVER_NAME, sp->number); 96 96 97 - if (ibmasm_event_buffer_init(sp)) { 97 + result = ibmasm_event_buffer_init(sp); 98 + if (result) { 98 99 dev_err(sp->dev, "Failed to allocate event buffer\n"); 99 100 goto error_eventbuffer; 100 101 } 101 102 102 - if (ibmasm_heartbeat_init(sp)) { 103 + result = ibmasm_heartbeat_init(sp); 104 + if (result) { 103 105 dev_err(sp->dev, "Failed to allocate heartbeat command\n"); 104 106 goto error_heartbeat; 105 107 }
+1 -1
drivers/net/ethernet/aquantia/Kconfig
··· 9 9 Set this to y if you have an Ethernet network cards that uses the aQuantia 10 10 AQC107/AQC108 chipset. 11 11 12 - This option does not build any drivers; it casues the aQuantia 12 + This option does not build any drivers; it causes the aQuantia 13 13 drivers that can be built to appear in the list of Ethernet drivers. 14 14 15 15
+2 -2
drivers/nfc/st-nci/Kconfig
··· 11 11 select NFC_ST_NCI 12 12 ---help--- 13 13 This module adds support for an I2C interface to the 14 - STMicroelectronics NFC NCI chips familly. 14 + STMicroelectronics NFC NCI chips family. 15 15 Select this if your platform is using the i2c bus. 16 16 17 17 If you choose to build a module, it'll be called st-nci_i2c. ··· 23 23 select NFC_ST_NCI 24 24 ---help--- 25 25 This module adds support for an SPI interface to the 26 - STMicroelectronics NFC NCI chips familly. 26 + STMicroelectronics NFC NCI chips family. 27 27 Select this if your platform is using the spi bus. 28 28 29 29 If you choose to build a module, it'll be called st-nci_spi.
+1 -1
drivers/nvdimm/Kconfig
··· 96 96 help 97 97 Support raw device dax access to a persistent memory 98 98 namespace. For environments that want to hard partition 99 - peristent memory, this capability provides a mechanism to 99 + persistent memory, this capability provides a mechanism to 100 100 sub-divide a namespace into character devices that can only be 101 101 accessed via DAX (mmap(2)). 102 102
+1 -1
drivers/platform/x86/Kconfig
··· 774 774 WARNING: This driver is incomplete as it lacks a proper keymap and the 775 775 *notify function only prints the ACPI event type value. Be warned that 776 776 you will need to provide some information if you have a Toshiba model 777 - with WMI event hotkeys and want to help with the develpment of this 777 + with WMI event hotkeys and want to help with the development of this 778 778 driver. 779 779 780 780 If you have a WMI-based hotkeys Toshiba laptop, say Y or M here.
+1 -1
drivers/power/supply/Kconfig
··· 182 182 tristate "SBS Compliant charger" 183 183 depends on I2C 184 184 help 185 - Say Y to include support for SBS compilant battery chargers. 185 + Say Y to include support for SBS compliant battery chargers. 186 186 187 187 config MANAGER_SBS 188 188 tristate "Smart Battery System Manager"
+1 -1
drivers/scsi/Kconfig
··· 787 787 depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI 788 788 help 789 789 This is the IBM POWER Virtual SCSI Target Server 790 - This driver uses the SRP protocol for communication betwen servers 790 + This driver uses the SRP protocol for communication between servers 791 791 guest and/or the host that run on the same server. 792 792 More information on VSCSI protocol can be found at www.power.org 793 793
+1 -1
fs/notify/fanotify/Kconfig
··· 21 21 decisions concerning filesystem events. This is used by some fanotify 22 22 listeners which need to scan files before allowing the system access to 23 23 use those files. This is used by some anti-malware vendors and by some 24 - hierarchical storage managent systems. 24 + hierarchical storage management systems. 25 25 26 26 If unsure, say N.
+3 -3
include/linux/kfifo.h
··· 325 325 * 326 326 * This macro dynamically allocates a new fifo buffer. 327 327 * 328 - * The numer of elements will be rounded-up to a power of 2. 328 + * The number of elements will be rounded-up to a power of 2. 329 329 * The fifo will be release with kfifo_free(). 330 330 * Return 0 if no error, otherwise an error code. 331 331 */ ··· 358 358 * @buffer: the preallocated buffer to be used 359 359 * @size: the size of the internal buffer, this have to be a power of 2 360 360 * 361 - * This macro initialize a fifo using a preallocated buffer. 361 + * This macro initializes a fifo using a preallocated buffer. 362 362 * 363 - * The numer of elements will be rounded-up to a power of 2. 363 + * The number of elements will be rounded-up to a power of 2. 364 364 * Return 0 if no error, otherwise an error code. 365 365 */ 366 366 #define kfifo_init(fifo, buffer, size) \
+1 -1
init/Kconfig
··· 1759 1759 help 1760 1760 Check modules for valid signatures upon load: the signature 1761 1761 is simply appended to the module. For more information see 1762 - Documentation/module-signing.txt. 1762 + <file:Documentation/admin-guide/module-signing.rst>. 1763 1763 1764 1764 Note that this option adds the OpenSSL development packages as a 1765 1765 kernel build dependency so that the signing tool can use its crypto
+2 -2
kernel/trace/Kconfig
··· 224 224 select GENERIC_TRACER 225 225 help 226 226 This tracer, when enabled will create one or more kernel threads, 227 - depening on what the cpumask file is set to, which each thread 227 + depending on what the cpumask file is set to, which each thread 228 228 spinning in a loop looking for interruptions caused by 229 229 something other than the kernel. For example, if a 230 230 System Management Interrupt (SMI) takes a noticeable amount of ··· 239 239 iteration 240 240 241 241 A kernel thread is created that will spin with interrupts disabled 242 - for "width" microseconds in every "widow" cycle. It will not spin 242 + for "width" microseconds in every "window" cycle. It will not spin 243 243 for "window - width" microseconds, where the system can 244 244 continue to operate. 245 245
+16
lib/xz/xz_dec_stream.c
··· 583 583 if (ret != XZ_OK) 584 584 return ret; 585 585 586 + /* Fall through */ 587 + 586 588 case SEQ_BLOCK_START: 587 589 /* We need one byte of input to continue. */ 588 590 if (b->in_pos == b->in_size) ··· 608 606 s->temp.pos = 0; 609 607 s->sequence = SEQ_BLOCK_HEADER; 610 608 609 + /* Fall through */ 610 + 611 611 case SEQ_BLOCK_HEADER: 612 612 if (!fill_temp(s, b)) 613 613 return XZ_OK; ··· 620 616 621 617 s->sequence = SEQ_BLOCK_UNCOMPRESS; 622 618 619 + /* Fall through */ 620 + 623 621 case SEQ_BLOCK_UNCOMPRESS: 624 622 ret = dec_block(s, b); 625 623 if (ret != XZ_STREAM_END) 626 624 return ret; 627 625 628 626 s->sequence = SEQ_BLOCK_PADDING; 627 + 628 + /* Fall through */ 629 629 630 630 case SEQ_BLOCK_PADDING: 631 631 /* ··· 650 642 } 651 643 652 644 s->sequence = SEQ_BLOCK_CHECK; 645 + 646 + /* Fall through */ 653 647 654 648 case SEQ_BLOCK_CHECK: 655 649 if (s->check_type == XZ_CHECK_CRC32) { ··· 675 665 676 666 s->sequence = SEQ_INDEX_PADDING; 677 667 668 + /* Fall through */ 669 + 678 670 case SEQ_INDEX_PADDING: 679 671 while ((s->index.size + (b->in_pos - s->in_start)) 680 672 & 3) { ··· 699 687 700 688 s->sequence = SEQ_INDEX_CRC32; 701 689 690 + /* Fall through */ 691 + 702 692 case SEQ_INDEX_CRC32: 703 693 ret = crc32_validate(s, b); 704 694 if (ret != XZ_STREAM_END) ··· 708 694 709 695 s->temp.size = STREAM_HEADER_SIZE; 710 696 s->sequence = SEQ_STREAM_FOOTER; 697 + 698 + /* Fall through */ 711 699 712 700 case SEQ_STREAM_FOOTER: 713 701 if (!fill_temp(s, b))
+4 -4
mm/huge_memory.c
··· 39 39 #include "internal.h" 40 40 41 41 /* 42 - * By default transparent hugepage support is disabled in order that avoid 43 - * to risk increase the memory footprint of applications without a guaranteed 44 - * benefit. When transparent hugepage support is enabled, is for all mappings, 45 - * and khugepaged scans all mappings. 42 + * By default, transparent hugepage support is disabled in order to avoid 43 + * risking an increased memory footprint for applications that are not 44 + * guaranteed to benefit from it. When transparent hugepage support is 45 + * enabled, it is for all mappings, and khugepaged scans all mappings. 46 46 * Defrag is invoked by khugepaged hugepage allocations and by page faults 47 47 * for all hugepage allocations. 48 48 */
+5 -5
samples/trace_events/trace-events-sample.h
··· 96 96 * __entry->bar.x = y; 97 97 98 98 * __array: There are three fields (type, name, size). The type is the 99 - * type of elements in teh array, the name is the name of the array. 99 + * type of elements in the array, the name is the name of the array. 100 100 * size is the number of items in the array (not the total size). 101 101 * 102 102 * __array( char, foo, 10) is the same as saying: char foo[10]; ··· 113 113 * type is the type of the element, name is the name of the array. 114 114 * The size is different than __array. It is not a static number, 115 115 * but the algorithm to figure out the length of the array for the 116 - * specific instance of tracepoint. Again, size is the numebr of 116 + * specific instance of tracepoint. Again, size is the number of 117 117 * items in the array, not the total length in bytes. 118 118 * 119 119 * __dynamic_array( int, foo, bar) is similar to: int foo[bar]; ··· 126 126 * Notice, that "__entry" is not needed here. 127 127 * 128 128 * __string: This is a special kind of __dynamic_array. It expects to 129 - * have a nul terminated character array passed to it (it allows 129 + * have a null terminated character array passed to it (it allows 130 130 * for NULL too, which would be converted into "(null)"). __string 131 - * takes two paramenter (name, src), where name is the name of 131 + * takes two parameter (name, src), where name is the name of 132 132 * the string saved, and src is the string to copy into the 133 133 * ring buffer. 134 134 * ··· 445 445 446 446 /* 447 447 * Here's a better way for the previous samples (except, the first 448 - * exmaple had more fields and could not be used here). 448 + * example had more fields and could not be used here). 449 449 */ 450 450 DEFINE_EVENT(foo_template, foo_with_template_simple, 451 451 TP_PROTO(const char *foo, int bar),