public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Shuah Khan <skhan@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
	Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>,
	Shuah Khan <shuah@kernel•org>,
	"Rafael J. Wysocki" <rafael@kernel•org>,
	Borislav Petkov <bp@suse•de>
Cc: Brahadambal Srinivasan <latha@linux•vnet.ibm.com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the cpupower tree
Date: Mon, 30 Nov 2020 13:53:24 -0700	[thread overview]
Message-ID: <e66c627b-0666-ee4f-fc3e-57cb2ad98fb9@linuxfoundation.org> (raw)
In-Reply-To: <20201123134259.2dc63db7@canb.auug.org.au>

On 11/22/20 7:42 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>    tools/power/cpupower/utils/helpers/misc.c
> 
> between commit:
> 
>    748f0d70087c ("cpupower: Provide online and offline CPU information")
> 
> from the cpupower tree and commit:
> 
>    8113ab20e850 ("tools/power/cpupower: Read energy_perf_bias from sysfs")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Thanks. Fix looks good to me. I will mention it in my pull
request to Rafael.

thanks,
--Shuah

     prev parent reply	other threads:[~2020-11-30 20:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23  2:42 linux-next: manual merge of the tip tree with the cpupower tree Stephen Rothwell
2020-11-30 20:53 ` Shuah Khan [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e66c627b-0666-ee4f-fc3e-57cb2ad98fb9@linuxfoundation.org \
    --to=skhan@linuxfoundation$(echo .)org \
    --cc=bp@suse$(echo .)de \
    --cc=hpa@zytor$(echo .)com \
    --cc=latha@linux$(echo .)vnet.ibm.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=peterz@infradead$(echo .)org \
    --cc=rafael@kernel$(echo .)org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=shuah@kernel$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox