Date: Mon, 17 Aug 2015 07:54:07 +0530
From: Viresh Kumar <viresh.kumar@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eduardo Valentin <edubezval@gmail.com>,
        Russell King <linux@arm.linux.org.uk>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the thermal-soc tree with the arm
 tree
Message-ID: <20150817022407.GN1162@linux>
References: <20150817121754.04736e67@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150817121754.04736e67@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1260
Lines: 39

On 17-08-15, 12:17, Stephen Rothwell wrote:
> Hi Eduardo,
> 
> Today's linux-next merge of the thermal-soc tree got a conflict in:
> 
>   drivers/thermal/cpu_cooling.c
> 
> between commit:
> 
>   df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> 
> from the arm tree and commits:
> 
>   02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>   a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
> 
> from the thermal-soc tree.
> 
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).

Right the version from the thermal tree is the updated version and
should be picked.

> Russell: that commit in your tree has no Signed-off-by :-(

No. It does have a SOB, but that followed a bit of rant/history on why
Russell carried this patch :)

Russell should be dropping that patch soon, AFAIU.

-- 
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/