Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

Re: linux-next: manual merge of the trivial tree with the tree

0 views
Skip to first unread message

Stephen Rothwell

unread,
Feb 7, 2010, 11:50:03 PM2/7/10
to
Hi Jiri,

On Mon, 8 Feb 2010 15:48:08 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/alchemy/common/reset.c between commit
> 139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
> common/reset.c") from the tree and commit
^
mips tree, of course.

--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Stephen Rothwell

unread,
Feb 7, 2010, 11:50:02 PM2/7/10
to
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/mips/alchemy/common/reset.c between commit
139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
common/reset.c") from the tree and commit

ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former removes the file updated by the latter.

Jiri Kosina

unread,
Feb 9, 2010, 5:10:02 AM2/9/10
to
On Mon, 8 Feb 2010, Stephen Rothwell wrote:

> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/alchemy/common/reset.c between commit
> 139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
> common/reset.c") from the tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
>
> The former removes the file updated by the latter.

Thanks, I have dropped the respective hunk from the patch in my queue.

--
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

0 new messages