diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 14:52:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 14:52:59 -0700 |
| commit | 69c1fd97266bcdcfdba1e3ea57773c80e0551e1a (patch) | |
| tree | d7c316d623fa703b9d268c2a4d3624f5a7de988b /drivers/s390/block | |
| parent | 72f35423e8a6a2451c202f52cb8adb92b08592ec (diff) | |
| parent | fad7c9020948eab2bc4661eade4e1ef357279590 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"My attempt to revitalize trivial queue I've been neglecting for years
(what a disaster that was for this world, right? :) ) with patches
collected from backlog that were still relevant and not applied
elsewhere in the meantime"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
err.h: remove deprecated PTR_RET for good
blk-mq: Fix typo in comment
x86/boot: Fix comment spelling
sh: mach-highlander: Fix comment spelling
s390/dasd: Fix comment spelling
mfd: wm8994: Fix comment spelling
docs: Add reference in binfmt-misc.rst
genirq: fix kerneldoc comment for irq_desc
drm/amdgpu: fix two documentation mismatch issues
HID: fix Kconfig word ordering
list/hashtable: minor documentation corrections.
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dasd_3990_erp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index ee73b0607e47..4691a3c35d72 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c @@ -1987,7 +1987,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense) * DASD_3990_ERP_COMPOUND_CONFIG * * DESCRIPTION - * Handles the compound ERP action for configruation + * Handles the compound ERP action for configuration * dependent error. * Note: duplex handling is not implemented (yet). * |