diff options
| author | David S. Miller | 2019-05-08 02:22:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-05-08 02:22:09 +0200 |
| commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
| tree | 544bf5861113e2f7e676a333a1267d887c800870 /net/rds | |
| parent | net: phy: improve pause mode reporting in phy_print_status (diff) | |
| parent | cxgb4: Fix error path in cxgb4_init_module (diff) | |
| download | kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.gz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.xz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index faf726e00e27..66121bc6f34e 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -551,7 +551,7 @@ static __net_init int rds_tcp_init_net(struct net *net) tbl = kmemdup(rds_tcp_sysctl_table, sizeof(rds_tcp_sysctl_table), GFP_KERNEL); if (!tbl) { - pr_warn("could not set allocate syctl table\n"); + pr_warn("could not set allocate sysctl table\n"); return -ENOMEM; } rtn->ctl_table = tbl; |