From 5a244f48ecbbd03a11eb84819c5c599db81823ee Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Wed, 3 May 2017 19:00:39 +0300 Subject: lib/xz: Add fall-through comments to a switch statement It's good style. I was also told that GCC 7 is more strict and might give a warning when such comments are missing. Signed-off-by: Lasse Collin Suggested-by: Andrei Borzenkov Signed-off-by: Jiri Kosina --- lib/xz/xz_dec_stream.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/xz/xz_dec_stream.c b/lib/xz/xz_dec_stream.c index ac809b1e64f7..bd1d182419d7 100644 --- a/lib/xz/xz_dec_stream.c +++ b/lib/xz/xz_dec_stream.c @@ -583,6 +583,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) if (ret != XZ_OK) return ret; + /* Fall through */ + case SEQ_BLOCK_START: /* We need one byte of input to continue. */ if (b->in_pos == b->in_size) @@ -606,6 +608,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->temp.pos = 0; s->sequence = SEQ_BLOCK_HEADER; + /* Fall through */ + case SEQ_BLOCK_HEADER: if (!fill_temp(s, b)) return XZ_OK; @@ -616,6 +620,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->sequence = SEQ_BLOCK_UNCOMPRESS; + /* Fall through */ + case SEQ_BLOCK_UNCOMPRESS: ret = dec_block(s, b); if (ret != XZ_STREAM_END) @@ -623,6 +629,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->sequence = SEQ_BLOCK_PADDING; + /* Fall through */ + case SEQ_BLOCK_PADDING: /* * Size of Compressed Data + Block Padding @@ -643,6 +651,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->sequence = SEQ_BLOCK_CHECK; + /* Fall through */ + case SEQ_BLOCK_CHECK: if (s->check_type == XZ_CHECK_CRC32) { ret = crc32_validate(s, b); @@ -665,6 +675,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->sequence = SEQ_INDEX_PADDING; + /* Fall through */ + case SEQ_INDEX_PADDING: while ((s->index.size + (b->in_pos - s->in_start)) & 3) { @@ -687,6 +699,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->sequence = SEQ_INDEX_CRC32; + /* Fall through */ + case SEQ_INDEX_CRC32: ret = crc32_validate(s, b); if (ret != XZ_STREAM_END) @@ -695,6 +709,8 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b) s->temp.size = STREAM_HEADER_SIZE; s->sequence = SEQ_STREAM_FOOTER; + /* Fall through */ + case SEQ_STREAM_FOOTER: if (!fill_temp(s, b)) return XZ_OK; -- cgit v1.2.3-58-ga151 From b14d595aa299236729380e4279c42cb526025026 Mon Sep 17 00:00:00 2001 From: Michael DeGuzis Date: Wed, 17 May 2017 15:19:21 -0400 Subject: mm/huge_memory.c: fixup grammar in comment This patch fixes up some grammar and spelling in the information block for huge_memory.c. Signed-off-by: Michael DeGuzis Signed-off-by: Jiri Kosina --- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 269b5df58543..1e3541d18c62 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -39,10 +39,10 @@ #include "internal.h" /* - * By default transparent hugepage support is disabled in order that avoid - * to risk increase the memory footprint of applications without a guaranteed - * benefit. When transparent hugepage support is enabled, is for all mappings, - * and khugepaged scans all mappings. + * By default, transparent hugepage support is disabled in order to avoid + * risking an increased memory footprint for applications that are not + * guaranteed to benefit from it. When transparent hugepage support is + * enabled, it is for all mappings, and khugepaged scans all mappings. * Defrag is invoked by khugepaged hugepage allocations and by page faults * for all hugepage allocations. */ -- cgit v1.2.3-58-ga151 From 9b35a682c9063b40bed993b9a7141521221f127d Mon Sep 17 00:00:00 2001 From: Nikitas Angelinas Date: Mon, 29 May 2017 17:34:35 -0700 Subject: MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig Netlink mmap support and the relevant CONFIG_NETLINK_MMAP option have been reverted by commit d1b4c689d4130bcfd3532680b64db562300716b6 ("netlink: remove mmapped netlink support"). Remove the occurrence of CONFIG_NETLINK_MMAP from db1xxx_defconfig. Signed-off-by: Nikitas Angelinas Cc: Patrick McHardy Cc: Florian Westphal Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: Jiri Kosina Signed-off-by: Jiri Kosina --- arch/mips/configs/db1xxx_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index f0c8971030c4..0108bb9f1e37 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig @@ -77,7 +77,6 @@ CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y CONFIG_BRIDGE=y -CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=y CONFIG_IRDA=y CONFIG_IRLAN=y -- cgit v1.2.3-58-ga151 From c5c1ea75a352c3864c4891f36155287a2ed73928 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Tue, 13 Jun 2017 13:06:59 +0200 Subject: tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER Trivial spelling fixes for Kconfig help text of config HWLAT_TRACER. Fixes: e7c15cd8a113 ("tracing: Added hardware latency tracer") Signed-off-by: Jesper Dangaard Brouer Acked-by: Steven Rostedt Signed-off-by: Jiri Kosina --- kernel/trace/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 434c840e2d82..f54b7b6b4a4b 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -224,7 +224,7 @@ config HWLAT_TRACER select GENERIC_TRACER help This tracer, when enabled will create one or more kernel threads, - depening on what the cpumask file is set to, which each thread + depending on what the cpumask file is set to, which each thread spinning in a loop looking for interruptions caused by something other than the kernel. For example, if a System Management Interrupt (SMI) takes a noticeable amount of @@ -239,7 +239,7 @@ config HWLAT_TRACER iteration A kernel thread is created that will spin with interrupts disabled - for "width" microseconds in every "widow" cycle. It will not spin + for "width" microseconds in every "window" cycle. It will not spin for "window - width" microseconds, where the system can continue to operate. -- cgit v1.2.3-58-ga151 From 27019975617864ce03d3b0c2a0c1fccc6b572509 Mon Sep 17 00:00:00 2001 From: Jeremy Linton Date: Fri, 16 Jun 2017 12:07:35 -0500 Subject: tracing: Fix doc mistakes in trace sample The trace sample file has a couple mispellings, lets fix them. Signed-off-by: Jeremy Linton Signed-off-by: Jiri Kosina --- samples/trace_events/trace-events-sample.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/trace_events/trace-events-sample.h b/samples/trace_events/trace-events-sample.h index 76a75ab7a608..b3858143f1a9 100644 --- a/samples/trace_events/trace-events-sample.h +++ b/samples/trace_events/trace-events-sample.h @@ -95,7 +95,7 @@ * __entry->bar.x = y; * __array: There are three fields (type, name, size). The type is the - * type of elements in teh array, the name is the name of the array. + * type of elements in the array, the name is the name of the array. * size is the number of items in the array (not the total size). * * __array( char, foo, 10) is the same as saying: char foo[10]; @@ -112,7 +112,7 @@ * type is the type of the element, name is the name of the array. * The size is different than __array. It is not a static number, * but the algorithm to figure out the length of the array for the - * specific instance of tracepoint. Again, size is the numebr of + * specific instance of tracepoint. Again, size is the number of * items in the array, not the total length in bytes. * * __dynamic_array( int, foo, bar) is similar to: int foo[bar]; @@ -125,9 +125,9 @@ * Notice, that "__entry" is not needed here. * * __string: This is a special kind of __dynamic_array. It expects to - * have a nul terminated character array passed to it (it allows + * have a null terminated character array passed to it (it allows * for NULL too, which would be converted into "(null)"). __string - * takes two paramenter (name, src), where name is the name of + * takes two parameter (name, src), where name is the name of * the string saved, and src is the string to copy into the * ring buffer. * @@ -444,7 +444,7 @@ DECLARE_EVENT_CLASS(foo_template, /* * Here's a better way for the previous samples (except, the first - * exmaple had more fields and could not be used here). + * example had more fields and could not be used here). */ DEFINE_EVENT(foo_template, foo_with_template_simple, TP_PROTO(const char *foo, int bar), -- cgit v1.2.3-58-ga151 From 9093de6052587d7d1398b4e8996e955b4aaec331 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 20 Jun 2017 18:17:29 +0200 Subject: MAINTAINERS: Correct path to uDraw PS3 driver Signed-off-by: Bastien Nocera Signed-off-by: Jiri Kosina --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ef23cf5f74c2..dd1248f5e481 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13756,7 +13756,7 @@ UDRAW TABLET M: Bastien Nocera L: linux-input@vger.kernel.org S: Maintained -F: drivers/hid/hid-udraw.c +F: drivers/hid/hid-udraw-ps3.c UFS FILESYSTEM M: Evgeniy Dushistov -- cgit v1.2.3-58-ga151 From df47b246ed176b504b1d50ad63aa5a3bf7551f82 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Fri, 14 Jul 2017 14:37:12 +0100 Subject: HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback" Trivial fix to spelling mistake in hid_info message and add line break to split an overly long line to clean up a checkpatch warning. Signed-off-by: Colin Ian King Acked-By: Benjamin Tissoires Signed-off-by: Jiri Kosina --- drivers/hid/hid-logitech-hidpp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 614054af904a..19cc980eebce 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -1957,7 +1957,8 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) /* initialize with zero autocenter to get wheel in usable state */ hidpp_ff_set_autocenter(dev, 0); - hid_info(hid, "Force feeback support loaded (firmware release %d).\n", version); + hid_info(hid, "Force feedback support loaded (firmware release %d).\n", + version); return 0; } -- cgit v1.2.3-58-ga151 From f403f85f5334fb169d5c00deac106f140b62d3c9 Mon Sep 17 00:00:00 2001 From: Anton Vasilyev Date: Tue, 1 Aug 2017 16:25:59 +0300 Subject: misc: ibmasm: Return error on error path If ibmasm_event_buffer_init() or ibmasm_heartbeat_init() fails, then ibmasm_init_one() release all resources and return 0 on error path. The patch adds corresponding error for fails. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Anton Vasilyev Reviewed-by: Andy Shevchenko Signed-off-by: Jiri Kosina --- drivers/misc/ibmasm/event.c | 2 +- drivers/misc/ibmasm/module.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c index 8e540f4e9d52..7e33025b4854 100644 --- a/drivers/misc/ibmasm/event.c +++ b/drivers/misc/ibmasm/event.c @@ -155,7 +155,7 @@ int ibmasm_event_buffer_init(struct service_processor *sp) buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL); if (!buffer) - return 1; + return -ENOMEM; buffer->next_index = 0; buffer->next_serial_number = 1; diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index c5a456b0a564..e914b8c80943 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c @@ -94,12 +94,14 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) snprintf(sp->dirname, IBMASM_NAME_SIZE, "%d", sp->number); snprintf(sp->devname, IBMASM_NAME_SIZE, "%s%d", DRIVER_NAME, sp->number); - if (ibmasm_event_buffer_init(sp)) { + result = ibmasm_event_buffer_init(sp); + if (result) { dev_err(sp->dev, "Failed to allocate event buffer\n"); goto error_eventbuffer; } - if (ibmasm_heartbeat_init(sp)) { + result = ibmasm_heartbeat_init(sp); + if (result) { dev_err(sp->dev, "Failed to allocate heartbeat command\n"); goto error_heartbeat; } -- cgit v1.2.3-58-ga151 From cbdc8217020b87f039e43ff752c613fa7d5bddd8 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sun, 10 Sep 2017 02:48:29 -0700 Subject: init/Kconfig: Fix module signing document location This was moved in commit 94e980cc45f2 ("Documentation/module-signing.txt: convert to ReST markup") and was missed by commit 8c27ceff3604 ("docs: fix locations of several documents that got moved"). Signed-off-by: Nathan Chancellor Signed-off-by: Jiri Kosina --- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 78cb2461012e..3aef23a19b86 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1752,7 +1752,7 @@ config MODULE_SIG help Check modules for valid signatures upon load: the signature is simply appended to the module. For more information see - Documentation/module-signing.txt. + . Note that this option adds the OpenSSL development packages as a kernel build dependency so that the signing tool can use its crypto -- cgit v1.2.3-58-ga151 From 24d654fadd70884a719c45ffabb0fe6033996f92 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET Date: Sat, 23 Sep 2017 12:08:16 +0200 Subject: kfifo: Fix comments Fix some typo. Signed-off-by: Christophe JAILLET Signed-off-by: Jiri Kosina --- include/linux/kfifo.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 41eb6fdf87a8..7b45959ebd92 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -325,7 +325,7 @@ __kfifo_uint_must_check_helper( \ * * This macro dynamically allocates a new fifo buffer. * - * The numer of elements will be rounded-up to a power of 2. + * The number of elements will be rounded-up to a power of 2. * The fifo will be release with kfifo_free(). * Return 0 if no error, otherwise an error code. */ @@ -358,9 +358,9 @@ __kfifo_int_must_check_helper( \ * @buffer: the preallocated buffer to be used * @size: the size of the internal buffer, this have to be a power of 2 * - * This macro initialize a fifo using a preallocated buffer. + * This macro initializes a fifo using a preallocated buffer. * - * The numer of elements will be rounded-up to a power of 2. + * The number of elements will be rounded-up to a power of 2. * Return 0 if no error, otherwise an error code. */ #define kfifo_init(fifo, buffer, size) \ -- cgit v1.2.3-58-ga151 From 83fc61a563cb4de3386ddc997cf8fc0ba55ec4ca Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Tue, 26 Sep 2017 12:47:59 +0900 Subject: treewide: Fix typos in Kconfig This patch fixes some spelling typos found in Kconfig files. Signed-off-by: Masanari Iida Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- arch/alpha/Kconfig | 2 +- arch/arc/Kconfig | 6 +++--- arch/arm/mach-bcm/Kconfig | 6 +++--- arch/arm/plat-samsung/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/powerpc/platforms/Kconfig | 2 +- arch/unicore32/Kconfig | 2 +- arch/xtensa/Kconfig | 2 +- drivers/net/ethernet/aquantia/Kconfig | 2 +- drivers/nfc/st-nci/Kconfig | 4 ++-- drivers/nvdimm/Kconfig | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/power/supply/Kconfig | 2 +- drivers/scsi/Kconfig | 2 +- fs/notify/fanotify/Kconfig | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 0e49d39ea74a..aa6b11957cd7 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -505,7 +505,7 @@ config ALPHA_QEMU Generic kernels will auto-detect QEMU. But when building a system-specific kernel, the assumption is that we want to - elimiate as many runtime tests as possible. + eliminate as many runtime tests as possible. If unsure, say N. diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index c84e67fdea09..5c7adf100a58 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -298,7 +298,7 @@ config ARC_MMU_V1 config ARC_MMU_V2 bool "MMU v2" help - Fixed the deficiency of v1 - possible thrashing in memcpy sceanrio + Fixed the deficiency of v1 - possible thrashing in memcpy scenario when 2 D-TLB and 1 I-TLB entries index into same 2way set. config ARC_MMU_V3 @@ -371,7 +371,7 @@ config ARC_FPU_SAVE_RESTORE bool "Enable FPU state persistence across context switch" default n help - Double Precision Floating Point unit had dedictaed regs which + Double Precision Floating Point unit had dedicated regs which need to be saved/restored across context-switch. Note that ARC FPU is overly simplistic, unlike say x86, which has hardware pieces to allow software to conditionally save/restore, @@ -467,7 +467,7 @@ config ARC_PLAT_NEEDS_PHYS_TO_DMA bool config ARC_KVADDR_SIZE - int "Kernel Virtaul Address Space size (MB)" + int "Kernel Virtual Address Space size (MB)" range 0 512 default "256" help diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 73be3d578851..2ff115a765dc 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -22,7 +22,7 @@ config ARCH_BCM_IPROC help This enables support for systems based on Broadcom IPROC architected SoCs. The IPROC complex contains one or more ARM CPUs along with common - core periperals. Application specific SoCs are created by adding a + core peripherals. Application specific SoCs are created by adding a uArchitecture containing peripherals outside of the IPROC complex. Currently supported SoCs are Cygnus. @@ -68,8 +68,8 @@ config ARCH_BCM_5301X Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. This is a network SoC line mostly used in home routers and - wifi access points, it's internal name is Northstar. - This inclused the following SoC: BCM53010, BCM53011, BCM53012, + wifi access points, its internal name is Northstar. + This includes the following SoC: BCM53010, BCM53011, BCM53012, BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707, BCM4708 and BCM4709. diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index e8229b9fee4a..8d4a64cc644c 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -278,7 +278,7 @@ config SAMSUNG_PM_CHECK_CHUNKSIZE help Set the chunksize in Kilobytes of the CRC for checking memory corruption over suspend and resume. A smaller value will mean that - the CRC data block will take more memory, but wil identify any + the CRC data block will take more memory, but will identify any faults with better precision. See diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0df64a6a56d4..416dbc637dc8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -946,7 +946,7 @@ config ARM64_UAO help User Access Override (UAO; part of the ARMv8.2 Extensions) causes the 'unprivileged' variant of the load/store instructions to - be overriden to be privileged. + be overridden to be privileged. This option changes get_user() and friends to use the 'unprivileged' variant of the load/store instructions. This ensures that user-space diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 4fd64d3f5c44..aac89f51d824 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -78,7 +78,7 @@ config UDBG_RTAS_CONSOLE config PPC_SMP_MUXED_IPI bool help - Select this opton if your platform supports SMP and your + Select this option if your platform supports SMP and your interrupt controller provides less than 4 interrupts to each cpu. This will enable the generic code to multiplex the 4 messages on to one ipi. diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 0769066929c6..ac4c47201e5e 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -114,7 +114,7 @@ endif source "arch/unicore32/mm/Kconfig" -comment "Floating poing support" +comment "Floating point support" config UNICORE_FPU_F64 def_bool y if !ARCH_FPGA diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 7ad6d77b2f22..7c3694c20d62 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -223,7 +223,7 @@ config INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX then enter your normal kernel breakpoints once the MMU was mapped to the kernel mappings (0XC0000000). - This unfortunately doesn't work for U-Boot and likley also wont + This unfortunately won't work for U-Boot and likely also wont work for using KEXEC to have a hot kernel ready for doing a KDUMP. diff --git a/drivers/net/ethernet/aquantia/Kconfig b/drivers/net/ethernet/aquantia/Kconfig index cdf78e069a39..7d623e90dc19 100644 --- a/drivers/net/ethernet/aquantia/Kconfig +++ b/drivers/net/ethernet/aquantia/Kconfig @@ -9,7 +9,7 @@ config NET_VENDOR_AQUANTIA Set this to y if you have an Ethernet network cards that uses the aQuantia AQC107/AQC108 chipset. - This option does not build any drivers; it casues the aQuantia + This option does not build any drivers; it causes the aQuantia drivers that can be built to appear in the list of Ethernet drivers. diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig index dc9b777d78f6..5c6e21ccb19c 100644 --- a/drivers/nfc/st-nci/Kconfig +++ b/drivers/nfc/st-nci/Kconfig @@ -11,7 +11,7 @@ config NFC_ST_NCI_I2C select NFC_ST_NCI ---help--- This module adds support for an I2C interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the i2c bus. If you choose to build a module, it'll be called st-nci_i2c. @@ -23,7 +23,7 @@ config NFC_ST_NCI_SPI select NFC_ST_NCI ---help--- This module adds support for an SPI interface to the - STMicroelectronics NFC NCI chips familly. + STMicroelectronics NFC NCI chips family. Select this if your platform is using the spi bus. If you choose to build a module, it'll be called st-nci_spi. diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index 5bdd499b5f4f..a65f2e1d9f53 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -96,7 +96,7 @@ config NVDIMM_DAX help Support raw device dax access to a persistent memory namespace. For environments that want to hard partition - peristent memory, this capability provides a mechanism to + persistent memory, this capability provides a mechanism to sub-divide a namespace into character devices that can only be accessed via DAX (mmap(2)). diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 80b87954f6dd..09dac11337d1 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -774,7 +774,7 @@ config TOSHIBA_WMI WARNING: This driver is incomplete as it lacks a proper keymap and the *notify function only prints the ACPI event type value. Be warned that you will need to provide some information if you have a Toshiba model - with WMI event hotkeys and want to help with the develpment of this + with WMI event hotkeys and want to help with the development of this driver. If you have a WMI-based hotkeys Toshiba laptop, say Y or M here. diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 5ab90c1f3f7c..382669bf31f4 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -182,7 +182,7 @@ config CHARGER_SBS tristate "SBS Compliant charger" depends on I2C help - Say Y to include support for SBS compilant battery chargers. + Say Y to include support for SBS compliant battery chargers. config BATTERY_BQ27XXX tristate "BQ27xxx battery driver" diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 41366339b950..2b1cd3028749 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -786,7 +786,7 @@ config SCSI_IBMVSCSIS depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI help This is the IBM POWER Virtual SCSI Target Server - This driver uses the SRP protocol for communication betwen servers + This driver uses the SRP protocol for communication between servers guest and/or the host that run on the same server. More information on VSCSI protocol can be found at www.power.org diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index e5f911bd80d2..41355ce74ac0 100644 --- a/fs/notify/fanotify/Kconfig +++ b/fs/notify/fanotify/Kconfig @@ -21,6 +21,6 @@ config FANOTIFY_ACCESS_PERMISSIONS decisions concerning filesystem events. This is used by some fanotify listeners which need to scan files before allowing the system access to use those files. This is used by some anti-malware vendors and by some - hierarchical storage managent systems. + hierarchical storage management systems. If unsure, say N. -- cgit v1.2.3-58-ga151 From 32c210d724156a4c20f8465f83c445f6c47e2eb2 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 5 Oct 2017 22:39:04 +0200 Subject: MAINTAINERS: Update my email address I changed jobs recently, but the MAINTAINERS file was not mentioned in the HR checklist, hence a belated update. Signed-off-by: Michal Marek Signed-off-by: Jiri Kosina --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index dd1248f5e481..9627cb7a3b5f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3465,7 +3465,7 @@ COCCINELLE/Semantic Patches (SmPL) M: Julia Lawall M: Gilles Muller M: Nicolas Palix -M: Michal Marek +M: Michal Marek L: cocci@systeme.lip6.fr (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc W: http://coccinelle.lip6.fr/ @@ -7465,7 +7465,7 @@ F: fs/autofs4/ KERNEL BUILD + files below scripts/ (unless maintained elsewhere) M: Masahiro Yamada -M: Michal Marek +M: Michal Marek T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git L: linux-kbuild@vger.kernel.org S: Maintained -- cgit v1.2.3-58-ga151 From 1972d6c0c86dd8620ff9f2811ce875135ffb5405 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 10 Apr 2017 22:10:34 +0200 Subject: MAINTAINERS: relinquish kconfig Since about the time I was actually added in that file, I've been almost entirely absent, which totally sucks, and there is no excuse for my behaviour and for not having relinquished this earlier. My deepest apologies. Signed-off-by: "Yann E. MORIN" Cc: Michal Marek Cc: Masahiro Yamada Cc: Vincent Legoll Cc: Linus Torvalds Signed-off-by: Jiri Kosina --- MAINTAINERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9627cb7a3b5f..b1c106055a38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7433,10 +7433,8 @@ F: mm/kasan/ F: scripts/Makefile.kasan KCONFIG -M: "Yann E. MORIN" L: linux-kbuild@vger.kernel.org -T: git git://gitorious.org/linux-kconfig/linux-kconfig -S: Maintained +S: Orphan F: Documentation/kbuild/kconfig-language.txt F: scripts/kconfig/ -- cgit v1.2.3-58-ga151