Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs: Merge split strings

No idea why these were split in the first place...

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Jean Delvare and committed by
Jiri Kosina
df2e301f 497888cf

+3 -3
+1 -1
fs/ecryptfs/keystore.c
··· 2248 2248 auth_tok->token.password.session_key_encryption_key, 2249 2249 crypt_stat->key_size); 2250 2250 ecryptfs_printk(KERN_DEBUG, 2251 - "Cached session key " "encryption key: \n"); 2251 + "Cached session key encryption key:\n"); 2252 2252 if (ecryptfs_verbosity > 0) 2253 2253 ecryptfs_dump_hex(session_key_encryption_key, 16); 2254 2254 }
+1 -1
fs/jffs2/readinode.c
··· 1041 1041 /* FIXME: point() */ 1042 1042 err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf); 1043 1043 if (err) { 1044 - JFFS2_ERROR("can not read %d bytes from 0x%08x, " "error code: %d.\n", len, ref_offset(ref), err); 1044 + JFFS2_ERROR("can not read %d bytes from 0x%08x, error code: %d.\n", len, ref_offset(ref), err); 1045 1045 goto free_out; 1046 1046 } 1047 1047
+1 -1
fs/xfs/xfs_dir2_node.c
··· 1641 1641 1642 1642 if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) { 1643 1643 xfs_alert(mp, 1644 - "%s: dir ino " "%llu needed freesp block %lld for\n" 1644 + "%s: dir ino %llu needed freesp block %lld for\n" 1645 1645 " data block %lld, got %lld ifbno %llu lastfbno %d", 1646 1646 __func__, (unsigned long long)dp->i_ino, 1647 1647 (long long)xfs_dir2_db_to_fdb(mp, dbno),