From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@kernel•org>, Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Masanari Iida <standby24x7@gmail•com>,
Ben Skeggs <bskeggs@redhat•com>
Subject: linux-next: manual merge of the trivial tree with the drm tree
Date: Mon, 31 Aug 2015 13:24:05 +1000 [thread overview]
Message-ID: <20150831132405.4dec315e@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
between commit:
109c2f2f1c42 ("drm/nouveau/gr: switch to subdev printk macros")
from the drm tree and commit:
4bb138a47b7f ("drm/nouveau/gr: Fix typo in nv10.c")
from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
index 9436ada62cba,d6ace41830e9..000000000000
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
@@@ -791,7 -845,7 +791,7 @@@ nv10_gr_ctx_regs_find_offset(struct nv1
if (nv10_gr_ctx_regs[i] == reg)
return i;
}
- nvkm_error(subdev, "unknow offset nv10_ctx_regs %d\n", reg);
- nv_error(priv, "unknown offset nv10_ctx_regs %d\n", reg);
++ nvkm_error(subdev, "unknown offset nv10_ctx_regs %d\n", reg);
return -1;
}
@@@ -804,7 -857,7 +804,7 @@@ nv17_gr_ctx_regs_find_offset(struct nv1
if (nv17_gr_ctx_regs[i] == reg)
return i;
}
- nvkm_error(subdev, "unknow offset nv17_ctx_regs %d\n", reg);
- nv_error(priv, "unknown offset nv17_ctx_regs %d\n", reg);
++ nvkm_error(subdev, "unknown offset nv17_ctx_regs %d\n", reg);
return -1;
}
next reply other threads:[~2015-08-31 3:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-31 3:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-12 4:12 linux-next: manual merge of the trivial tree with the drm tree Stephen Rothwell
2010-02-12 4:41 ` Dave Airlie
2010-02-12 9:29 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150831132405.4dec315e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=bskeggs@redhat$(echo .)com \
--cc=jikos@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=standby24x7@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox