From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753645AbcGHHa6 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 8 Jul 2016 03:30:58 -0400
Received: from mail-qk0-f195.google.com ([209.85.220.195]:34668 "EHLO
	mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751559AbcGHHau (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 8 Jul 2016 03:30:50 -0400
Date: Fri, 8 Jul 2016 09:30:46 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Rik van Riel <riel@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
        LKML <linux-kernel@vger.kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>, rkrcmar@redhat.com,
        Thomas Gleixner <tglx@linutronix.de>, Mike Galbraith <efault@gmx.de>,
        wanpeng.li@hotmail.com
Subject: Re: [PATCH 0/2] sched/cputime: Deltas for "replace VTIME_GEN irq
 time code with IRQ_TIME_ACCOUNTING code"
Message-ID: <20160708073046.GA2859@gmail.com>
References: <1467901657-25749-1-git-send-email-fweisbec@gmail.com>
 <1467907884.13253.12.camel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1467907884.13253.12.camel@redhat.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Rik van Riel <riel@redhat.com> wrote:

> On Thu, 2016-07-07 at 16:27 +0200, Frederic Weisbecker wrote:
> > Hi Rick,
> > 
> > While reviewing your 2nd patch, I thought about these cleanups.
> > Perhaps
> > the first one could be merged into your patch. I let you decide.
> 
> I'm not convinced we want to merge cleanups and functional
> changes into the same patch, given how convoluted the code
> is/was.
> 
> Both of your patches look good though.
> 
> What tree should they go in through?

-tip I suspect. So my plan was the following, this series of yours:

  [PATCH v3 0/4] sched,time: fix irq time accounting with nohz_idle

... looked almost ready, it looked like as if I could merge v4 once you sent it.

Plus Frederic submitted these two cleanups - looks like I could merge these on top 
of your series and have them close to each other in the Git space.

And I do agree that we should keep these cleanups separate and not merge them into 
patches that change functionality.

If your series is expected to be risky then we could make things easier to handle 
later on if we switched around things and first made low-risk cleanups and then 
any changes/fixes on top - do you think that's necessary in this case?

Thanks,

	Ingo