lkml.org 
[lkml]   [2012]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the l2-mtd tree with Linus' tree
Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/nand/mxc_nand.c between commit 97c3213fd9fc ("mtd mxc_nand:
prepare/unprepare clock") from Linus' tree and commit 625bdd2a6bd0
("nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare") from the
l2-mtd tree.

The former is a superset of the latter.

This tree (l2-mtd) needs to be updated since most of its patches (but not
commits) have been merged into upstream trees. Artem, you and Dave
Woodhouse need to discuss your work flow. (Or I just need to remove the
l2-mtd tree from linux-next.)

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-29 04:41    [W:0.053 / U:0.856 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site