diff options
author | Petr Mladek <pmladek@suse.com> | 2020-12-14 15:15:07 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2020-12-14 15:15:07 +0100 |
commit | 5ed37174e6c7e1ed4abfd0d8e932a3044441fb5f (patch) | |
tree | 58dc095ed9b77a47194681dd013f8579dc80ebae /kernel/printk/printk.c | |
parent | 5f3b8d398601055f29f32986a94d55955cd48f09 (diff) | |
parent | 8d143c610b62f2820fbc97dc441d54ac326abe1a (diff) | |
download | linux-stable-5ed37174e6c7e1ed4abfd0d8e932a3044441fb5f.tar.gz linux-stable-5ed37174e6c7e1ed4abfd0d8e932a3044441fb5f.tar.bz2 linux-stable-5ed37174e6c7e1ed4abfd0d8e932a3044441fb5f.zip |
Merge branch 'for-5.11' into for-linus
Diffstat (limited to 'kernel/printk/printk.c')
-rw-r--r-- | kernel/printk/printk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ccbdac579bd0..8a90014434b3 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -695,7 +695,6 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from) if (LOG_FACILITY(u) != 0) facility = LOG_FACILITY(u); endp++; - len -= endp - line; line = endp; } } |