linux-kernel - linux-next: manual merge of the trivial tree with the btrfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130703152241.d9f23c7709f13a40493656f7@canb.auug.org.au>
Date:	Wed, 3 Jul 2013 15:22:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>,
	David Sterba <dsterba@...e.cz>,
	Chris Mason <chris.mason@...ionio.com>,
	Josef Bacik <jbacik@...ionio.com>
Subject: linux-next: manual merge of the trivial tree with the btrfs tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
fs/btrfs/free-space-cache.c between commit 905d0f564e9c ("btrfs: add
prefix to sanity tests messages") from the btrfs tree and commit
8b513d0cf603 ("treewide: Fix typo in printk") 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@...b.auug.org.au

diff --cc fs/btrfs/free-space-cache.c
index 7517285,2750b50..0000000
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@@ -3202,7 -3200,7 +3202,7 @@@ static int test_extents(struct btrfs_bl
  
  	ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096);
  	if (ret) {
- 		test_msg("Error removing middle peice %d\n", ret);
 -		printk(KERN_ERR "Error removing middle piece %d\n", ret);
++		test_msg("Error removing middle piece %d\n", ret);
  		return ret;
  	}
  

Content of type "application/pgp-signature" skipped