From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623AbeDESSY (ORCPT ); Thu, 5 Apr 2018 14:18:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:46390 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbeDESSX (ORCPT ); Thu, 5 Apr 2018 14:18:23 -0400 Date: Thu, 05 Apr 2018 20:18:22 +0200 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: Mark Brown , Liam Girdwood , Linux Kernel Mailing List Subject: Re: [GIT PULL] sound updates for 4.17-rc1 In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 slightly better than > > London tube. > > The patter with empty pointless merges from Mark Brown continues. > > 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. > > Stop it already. > > I'm going to ask Takashi to stop pulling stuff from you, and *I* am > going to stop pulling stuff from you, as long as you have these > idiotic automated daily empty merges. > > I'm attaching a screenshot of part of this to give as an example of > what I see when I pull. Argh, it's my fault that I overlooked that part, sorry. The recent merges were still complex (extremely fine-split branches) but they were no empty merges. Then I seem to have overlooked the middle carelessly. All the empty merges were during my previous vacation, so it must have been the leftover of the previous bad pull request. Oh well. Takashi > STOP MERGING THE SAME BRANCHES OVER AND OVER AGAIN, DAMMIT! > > If you have merged a branch once, don't do it again tomorrow. > > I have pulled this, but I won't pull this kind idiotic mess again. > > Linus