diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-09 13:16:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-09 13:16:34 +1100 |
| commit | 552555d69a872c719498629663b6da61eb18e6fb (patch) | |
| tree | a0d30fbcc222315971d9c58880298d9834cd626e | |
| parent | 7425b54c61914c4d4cba2a5e4026eb67b7f6f31f (diff) | |
| parent | 380cc42d5a6c98f3ac7ec196b32d79168293501f (diff) | |
Merge remote-tracking branch 'trivial/for-next'
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 2 | ||||
| -rw-r--r-- | drivers/nvme/host/lightnvm.c | 2 | ||||
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 | ||||
| -rw-r--r-- | net/netfilter/core.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 0a21daed5b62..03f40e464c35 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -152,7 +152,7 @@ static int intel_815_configure(void) /* the Intel 815 chipset spec. says that bits 29-31 in the * ATTBASE register are reserved -> try not to write them */ if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) { - dev_emerg(&agp_bridge->dev->dev, "gatt bus addr too high"); + dev_emerg(&agp_bridge->dev->dev, "gatt bus addr too high\n"); return -EINVAL; } diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 588d4a34c083..bd0c7a1c71a8 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -433,7 +433,7 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa, if (le32_to_cpu(bb_tbl->tblks) != nr_blks) { ret = -EINVAL; dev_err(ctrl->device, - "bbt unsuspected blocks returned (%u!=%u)", + "bbt unsuspected blocks returned (%u!=%u)\n", le32_to_cpu(bb_tbl->tblks), nr_blks); goto out; } diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 8679f1a17f09..1d97d9ac6bcb 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -856,7 +856,7 @@ static void abort_endio(struct request *req, int error) struct nvme_queue *nvmeq = iod->nvmeq; u16 status = req->errors; - dev_warn(nvmeq->dev->ctrl.device, "Abort status: 0x%x", status); + dev_warn(nvmeq->dev->ctrl.device, "Abort status: 0x%x\n", status); atomic_inc(&nvmeq->dev->ctrl.abort_limit); blk_mq_free_request(req); } diff --git a/net/netfilter/core.c b/net/netfilter/core.c index ce6adfae521a..b6a1759ed4b2 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -458,7 +458,7 @@ static int __net_init netfilter_net_init(struct net *net) net->proc_net); if (!net->nf.proc_netfilter) { if (!net_eq(net, &init_net)) - pr_err("cannot create netfilter proc entry"); + pr_err("cannot create netfilter proc entry\n"); return -ENOMEM; } |