Re: linux-next: manual merge of the rcu tree with the ext4 tree

From: Paul E. McKenney
Date: Mon Jul 18 2011 - 18:39:23 EST

Next message: Mark Einon: "[PATCH 1/3] staging: et131x: Convert et1310_tx.c function name from CamelCase"
Previous message: Grant Likely: "[PATCH v2 2/2] dt/irq: add irq_domain_generate_simple() helper"
In reply to: Stephen Rothwell: "linux-next: manual merge of the rcu tree with the ext4 tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Mark Einon: "[PATCH 1/3] staging: et131x: Convert et1310_tx.c function name from CamelCase"
Previous message: Grant Likely: "[PATCH v2 2/2] dt/irq: add irq_domain_generate_simple() helper"
In reply to: Stephen Rothwell: "linux-next: manual merge of the rcu tree with the ext4 tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]