Thread (26 messages) 26 messages, 8 authors, 2014-05-06

[PATCH 1/5] ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)

From: computersforpeace@gmail.com (Brian Norris)
Date: 2014-05-06 17:05:36
Also in: lkml

On Sun, May 04, 2014 at 11:53:22AM -0700, Olof Johansson wrote:
On Sun, May 4, 2014 at 10:42 AM, Jason Cooper [off-list ref] wrote:
quoted
On Sat, May 03, 2014 at 03:51:11PM -0700, Olof Johansson wrote:
quoted
Cases like these are easiest that we just take the patch directly in
an early-merge branch (i.e. cleanup or fixes-non-critical, or a
generic depends branch), and if there's conflicts as topics are merged
in from subplatforms we can deal with it then.
Are you referring to basing on -rc1, or the series being split up to
the individual sub-arch maintainers?

*slightly* confused,
I'm referring to us taking the patch into something like our cleanup
branch, and any branches that come in from you or other subplatforms
will be merged on top, so we can resolve conflicts there and then.
We'll merge in the cleanup branch into other next/* branches as needed
to resolve the conflicts in our tree instead of percolating them all
the way up.
In case you didn't notice, I already had split up the patch series a
little more for v2 (based on -rc1 still), and most of it seems to be
going through the sub-arch trees, I think. There is one patch targeted
directly at arm-soc (that's you, Olof?).

Let me know if v2 has any problems.

Thanks,
Brian
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help