* linux-next: lots of merges in the sound-asoc tree
@ 2018-02-12 22:38 Stephen Rothwell
2018-02-13 11:42 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-02-12 22:38 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Kuninori Morimoto
Hi all,
I know that you usually like to keep one topic branch per soc and then
merge them all, but currently your tree seems to only contain a couple
logical changes (platform to component and codec to component), so
surely that could have been done in (maybe) 2 topic branches and saved
large number of very small branches (often a single commit) and a large
number of merges.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: lots of merges in the sound-asoc tree
2018-02-12 22:38 linux-next: lots of merges in the sound-asoc tree Stephen Rothwell
@ 2018-02-13 11:42 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2018-02-13 11:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, Linux-Next Mailing List, Linux Kernel Mailing List,
Kuninori Morimoto
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
On Tue, Feb 13, 2018 at 09:38:57AM +1100, Stephen Rothwell wrote:
> I know that you usually like to keep one topic branch per soc and then
> merge them all, but currently your tree seems to only contain a couple
> logical changes (platform to component and codec to component), so
> surely that could have been done in (maybe) 2 topic branches and saved
> large number of very small branches (often a single commit) and a large
> number of merges.
If you look at the changes that are per branch (one series is on a
single branch due to dependencies and a lower change rate) they're often
relatively large and likely to conflict with further development that
gets done. This also lets me drop anything that causes problems much
more easily.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-13 11:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-12 22:38 linux-next: lots of merges in the sound-asoc tree Stephen Rothwell
2018-02-13 11:42 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).