From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA3AEC388F7 for ; Tue, 10 Nov 2020 07:53:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73B4920897 for ; Tue, 10 Nov 2020 07:53:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="HMe3YjF5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728538AbgKJHxB (ORCPT ); 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