* linux-next: manual merge of the rd-docs tree with the trivial tree
@ 2014-08-26 5:48 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-08-26 5:48 UTC (permalink / raw)
To: Randy Dunlap, Jiri Kosina
Cc: linux-next, linux-kernel, Pranith Kumar, Christoph Lameter
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Randy,
Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/this_cpu_ops.txt between commit 0c3ed93c1c2c ("doc: fix
acronym for read-modify-write") from the trivial tree and commit
1a62db155b94 ("doc: this_cpu_ops.txt: Update description of
this_cpu_ops") from the rd-docs tree.
I fixed it up (the latter is a superset of the former) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the rd-docs tree with the trivial tree
@ 2014-07-09 7:14 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-07-09 7:14 UTC (permalink / raw)
To: Randy Dunlap, Jiri Kosina
Cc: linux-next, linux-kernel, Rickard Strandqvist, Pali Rohár
[-- Attachment #1: Type: text/plain, Size: 1181 bytes --]
Hi Randy,
Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/laptops/freefall.c between commit d5ae11dc402f ("doc:
hpfall.c: fix missing null-terminate after strncpy call") from the
trivial tree and commit 0af05db576e9 ("Dell kernel driver dell-smo8800
provides same freefall interface as hp_accel so") from the rd-docs 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 Documentation/laptops/freefall.c
index 67084321dab4,aab2ff09e868..000000000000
--- a/Documentation/laptops/freefall.c
+++ b/Documentation/laptops/freefall.c
@@@ -27,8 -33,8 +33,9 @@@ static int set_unload_heads_path(char *
if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)
return -EINVAL;
- strncpy(devname, device + 5, sizeof(devname));
+ strncpy(devname, device + 5, sizeof(devname) - 1);
+ devname[sizeof(devname) - 1] = '\0';
+ strncpy(device_path, device, sizeof(device_path) - 1);
snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,
"/sys/block/%s/device/unload_heads", devname);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-26 5:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-26 5:48 linux-next: manual merge of the rd-docs tree with the trivial tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-07-09 7:14 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).