Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3808078pxb; Mon, 9 Nov 2020 23:55:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7pnyB9mhmcnM+ZBtg8mEECS0+0ty2Vkt6nG4LBLSKMAVgfKxDRAYB9jOPygw5za2BaIIo X-Received: by 2002:a17:906:f84f:: with SMTP id ks15mr18251242ejb.337.1604994935033; Mon, 09 Nov 2020 23:55:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604994935; cv=none; d=google.com; s=arc-20160816; b=XFOQIlHBi5U13z9xWHQxge5EJxjwMc3b/s+MZI2r+GNJX1o98I9KLqxiFrJKx1fKT6 PQ6+iK5Jwp6pFW/2QTQqjDHvNTVm45xBLU2Q6mM5oQ0vU7fSZKy3C/mTK5GKyFjddMpg Egny7dE8xDr2Kv0ZoPrfvL+1+LKbaMXrQI2DWwCOwbjCS0o0YGHUW7upX2HFc4xj/I7Y xrEqN2sUH7JZ9eT29bwW6ZjS/17d90YLLyhZ1JuBKEMQET4yICGMwka4YBzPtKfHosP5 Een0uEFv2l4bpfK/971fsdbeqzXCIulF5K2ouuIISsHzg7GX0M1CNvzqbbNIZ+Pa5avP s7jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=Jpoo1V2zZf+CMcXZmL7jgAiBw2ucwaVZVyF7MGpyAMQ=; b=PVIDUp+VMgyTxdy8AnRG6jiJAn1E9I5rXqAyjdTbbAslZqcimqe7kNnIYO1oLv0YF6 +gBS1IWPLQ2e4fk81wrGWb2aHOzEbRTCE1+RaQmh9hM8gQD/O6w7XkB6ggL1dEW4biqb ZO4iCqY9Fx/NJrcz04NDBCHSKkbnxnHOcGO1CjlCH0BZm9zZCT4eD0cnSVEaziV9J+YN 1G8gSol+yYcUVkqhHef8GFz2T9pU/HXarL5rULrZGzwRTSa9LxaI3IIwM3xjZNWWoOzq 2w1iyyblkmLKJCLq0/uim0i0Lzl2KeqbLWeHdqxsK/5EuLYRTWD9diBP6JfIaYjdZoDg mWqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HMe3YjF5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id rv18si457536ejb.320.2020.11.09.23.55.11; Mon, 09 Nov 2020 23:55:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HMe3YjF5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727001AbgKJHxB (ORCPT + 99 others); Tue, 10 Nov 2020 02:53:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:49334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727991AbgKJHxB (ORCPT ); Tue, 10 Nov 2020 02:53:01 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C19E62080A; Tue, 10 Nov 2020 07:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604994779; bh=rPLB8ZW/O1Mj3+XTff6lRKz9cmVYDe0J3AJ40wKKQxA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=HMe3YjF5V2OslRPGitMsrZ3TCNE3c5wYzIsguxSwogATB1Gg98yUx3r7PicqtKdPx vAYy5A8SDsOPNsmVtxaSOYqQHwjx1CjpLyfw3tVW7wZCnaUVDhymoOKBQLhuOg9q1d f6OimbkMNhUO/e0tWeaoLR4Je9fBV/EPH+ogVJiI= Date: Tue, 10 Nov 2020 08:53:56 +0100 From: Greg Kroah-Hartman To: Frankie Chang Cc: Todd Kjos , Joel Fernandes , Martijn Coenen , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Christian Brauner , linux-kernel@vger.kernel.org, wsd_upstream@mediatek.com, Jian-Min Liu Subject: Re: binder: add transaction latency tracer Message-ID: References: <1602781377-4278-1-git-send-email-Frankie.Chang@mediatek.com> <1603987737-2763-1-git-send-email-Frankie.Chang@mediatek.com> <20201109174605.GA2426739@kroah.com> <1604993580.14886.5.camel@mtkswgap22> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 10, 2020 at 08:52:09AM +0100, Greg Kroah-Hartman wrote: > On Tue, Nov 10, 2020 at 03:33:00PM +0800, Frankie Chang wrote: > > On Mon, 2020-11-09 at 18:46 +0100, Greg Kroah-Hartman wrote: > > > On Fri, Oct 30, 2020 at 12:08:54AM +0800, Frankie Chang wrote: > > > > Change from v11: > > > > - rebase. > > > > > > This whole patch set is sent with DOS line-ends, which makes git really > > > unhappy when it tries to apply it, as rightfully, it doesn't know how to > > > convert things. > > > > > Hmm.., actually I can use 'git apply' PATCH v11 from the message > > directly. > > Ok, let me see if I can figure this out on my end, let me try using `b4` > on this to see if that helps... Nope, there's still some merge conflicts here. b4 fixed the line-end issues, but can you please rebase on top of my char-misc-next branch in the char.git tree on git.kernel.org and resend? I think some changes by others are conflicting with this patchset somehow. thanks, greg k-h