Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

To resolve conflicts in:
 drivers/infiniband/hw/mlx5/main.c
 drivers/infiniband/hw/mlx5/qp.c

From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index d6dff347f896..78ebe494fef0 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -186,7 +186,7 @@ static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Obtain the queue to be used to transmit this packet */
         index = skb_get_queue_mapping(skb);
         if (index >= num_queues) {
-                pr_warn_ratelimited("Invalid queue %hu for packet on interface %s\n.",
+                pr_warn_ratelimited("Invalid queue %hu for packet on interface %s\n",
                                     index, vif->dev->name);
                 index %= num_queues;
         }