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 S1752196AbbIOLh2 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 15 Sep 2015 07:37:28 -0400
Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:56621 "EHLO
	shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751818AbbIOLh0 convert rfc822-to-8bit
	(ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 15 Sep 2015 07:37:26 -0400
Message-ID: <1442317041.29883.9.camel@decadent.org.uk>
Subject: Re: [PATCH 2.6.32 36/62] MIPS: Octeon: Delete override of
 cpu_has_mips_r2_exec_hazard.
From: Ben Hutchings <ben@decadent.org.uk>
To: Willy Tarreau <w@1wt.eu>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 15 Sep 2015 12:37:21 +0100
In-Reply-To: <20150912225608.122452818@1wt.eu>
References: <20150912225608.122452818@1wt.eu>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
X-Mailer: Evolution 3.12.9-1+b1 
Mime-Version: 1.0
X-SA-Exim-Connect-IP: 192.168.2.6
X-SA-Exim-Mail-From: ben@decadent.org.uk
X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, 2015-09-13 at 00:56 +0200, Willy Tarreau wrote:
> 2.6.32-longterm review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Ralf Baechle <ralf@linux-mips.org>
> 
> commit f05ff43355e6997c18f82ddcee370a6e5f8643ce upstream.
> 
> This is no longer needed with the fixed, new and improved definition
> of cpu_has_mips_r2_exec_hazard in <asm/cpu-features.h>.
[...]

This needs to be dropped along with the previous patch.

Ben.