On Thu, Apr 05, 2018 at 06:31:37PM -0700, Linus Torvalds wrote:
> On Thu, Apr 5, 2018 at 6:11 PM, Mark Brown wrote:
[No signature, managed to leave my smartcard at home, sorry :/]
> >> (3) if you are done and ready with a branch, and it's time to just
> >> say "the development on this branch is
On Thu, Apr 5, 2018 at 6:11 PM, Mark Brown wrote:
>
>> (3) if you are done and ready with a branch, and it's time to just
>> say "the development on this branch is all done, now I will ask
>> upstream to pull it, and I'll merge this into my upstream branch"
>
>> THIS IS NEVER AUTOMATED!
>
>>
On Thu, Apr 05, 2018 at 12:32:52PM -0700, Linus Torvalds wrote:
> The whole idea with a topic branch is that it's a topic branch. You do
> the development on that branch, and then at the END of development you
> merge it once and that branch is now *dead*. If you continue using
> that branch, you
On Thu, Apr 5, 2018 at 12:04 PM, Mark Brown wrote:
>
> I'm a little bit confused about what's best to do here. The reason I'm
> throwing the merge away and redoing it is that you've previously said
> that you don't want to see main development branches that contain
> nothing but long strings of m
On Thu, Apr 05, 2018 at 10:50:26AM -0700, Linus Torvalds wrote:
> Mark, we talked about this already. YOU ARE DOING SOMETHING HORRIBLY
> WRONG. You already admitted to automated merging, I already told you
> not to do that.
Ah, sorry - my impression was rather that the issue was the mess caused
b
On Thu, Apr 5, 2018 at 11:18 AM, Takashi Iwai wrote:
>
> All the empty merges were during my previous vacation, so it must have
> been the leftover of the previous bad pull request. Oh well.
Oh, so they might be from the bad old times when Mark was still doing
this, and be a symptom of something
On Thu, 05 Apr 2018 19:50:26 +0200,
Linus Torvalds wrote:
>
> On Thu, Apr 5, 2018 at 1:27 AM, Takashi Iwai wrote:
> >
> > This became a large update. The changes are scattered widely,
> > and majority of them are attributed to ASoC componentization.
> > The gitk output made me dizzy, but it's sl
7 matches
Mail list logo
