linux-kernel - linux-next: manual merge of the rcu tree with the ext4 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>] [thread-next>] [day] [month] [year] [list]

Date:	Sat, 16 Jul 2011 21:28:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Theodore Ts'o" <tytso@....edu>,
	Lai Jiangshan <laijs@...fujitsu.com>
Subject: linux-next: manual merge of the rcu tree with the ext4 tree

Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in
fs/jbd2/journal.c between commit 4862fd6047ed ("jbd2: remove
jbd2_dev_to_name() from jbd2 tracepoints") from the ext4 tree and commit
a5e245951e94 ("jbd2,rcu: Convert call_rcu(free_devcache) to kfree_rcu()")
from the rcu tree.

The former removes the function modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped