linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20110718223909.GE2312@linux.vnet.ibm.com>
Date:	Mon, 18 Jul 2011 15:39:09 -0700
From:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Theodore Ts'o" <tytso@....edu>,
	Lai Jiangshan <laijs@...fujitsu.com>
Subject: Re: linux-next: manual merge of the rcu tree with the ext4 tree

On Sat, Jul 16, 2011 at 09:28:38PM +1000, Stephen Rothwell wrote:
> 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.

I now have removed that patch in -rcu as well.

							Thanx, Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/