diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-22 11:16:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-22 11:16:31 -0500 |
| commit | fba961ab29e5ffb055592442808bb0f7962e05da (patch) | |
| tree | 5180c384b79399c469e0ed88211114e6ab249484 /arch/parisc/boot/compressed/misc.c | |
| parent | 0a80f0c26bf5a131892b91db5318eb67608006d2 (diff) | |
| parent | ead68f216110170ec729e2c4dec0aad6d38259d7 (diff) | |
| download | kernel_replicant_linux-fba961ab29e5ffb055592442808bb0f7962e05da.tar.gz kernel_replicant_linux-fba961ab29e5ffb055592442808bb0f7962e05da.tar.bz2 kernel_replicant_linux-fba961ab29e5ffb055592442808bb0f7962e05da.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of overlapping changes. Also on the net-next side
the XDP state management is handled more in the generic
layers so undo the 'net' nfp fix which isn't applicable
in net-next.
Include a necessary change by Jakub Kicinski, with log message:
====================
cls_bpf no longer takes care of offload tracking. Make sure
netdevsim performs necessary checks. This fixes a warning
caused by TC trying to remove a filter it has not added.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/boot/compressed/misc.c')
| -rw-r--r-- | arch/parisc/boot/compressed/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/boot/compressed/misc.c b/arch/parisc/boot/compressed/misc.c index 9345b44b86f0..f57118e1f6b4 100644 --- a/arch/parisc/boot/compressed/misc.c +++ b/arch/parisc/boot/compressed/misc.c @@ -123,8 +123,8 @@ int puts(const char *s) while ((nuline = strchr(s, '\n')) != NULL) { if (nuline != s) pdc_iodc_print(s, nuline - s); - pdc_iodc_print("\r\n", 2); - s = nuline + 1; + pdc_iodc_print("\r\n", 2); + s = nuline + 1; } if (*s != '\0') pdc_iodc_print(s, strlen(s)); |