Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753591AbbDGRv4 (ORCPT ); Tue, 7 Apr 2015 13:51:56 -0400 Received: from mail-am1on0088.outbound.protection.outlook.com ([157.56.112.88]:28160 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753026AbbDGRvx (ORCPT ); Tue, 7 Apr 2015 13:51:53 -0400 Message-ID: <55241928.4060909@ezchip.com> Date: Tue, 7 Apr 2015 13:51:36 -0400 From: Chris Metcalf User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Stephen Rothwell , Andrew Morton CC: , , Ulrich Obergfell , Don Zickus Subject: Re: linux-next: manual merge of the akpm-current tree with the tile tree References: <20150407212153.33327869@canb.auug.org.au> In-Reply-To: <20150407212153.33327869@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [12.216.194.146] X-ClientProxiedBy: BLUPR11CA0079.namprd11.prod.outlook.com (10.141.30.47) To HE1PR02MB0778.eurprd02.prod.outlook.com (25.161.118.142) Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR02MB0778; X-Forefront-Antispam-Report: BMV:1;SFV:NSPM;SFS:(10009020)(6009001)(6049001)(24454002)(479174004)(377454003)(76176999)(77156002)(62966003)(87976001)(122386002)(50466002)(54356999)(117636001)(40100003)(87266999)(36756003)(50986999)(99136001)(2950100001)(65816999)(15975445007)(77096005)(92566002)(47776003)(86362001)(19580395003)(42186005)(83506001)(66066001)(46102003)(65956001)(64126003)(65806001)(575784001)(62816006)(18886065003);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR02MB0778;H:[10.7.0.41];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5002010)(5005006);SRVR:HE1PR02MB0778;BCL:0;PCL:0;RULEID:;SRVR:HE1PR02MB0778; X-Forefront-PRVS: 0539EEBD11 X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2015 17:51:49.4172 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR02MB0778 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1301 Lines: 33 On 04/07/2015 07:21 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > kernel/watchdog.c between commit e164ade07b21 ("watchdog: add > watchdog_exclude sysctl to assist nohz") from the tile tree and commits > e0afaab242da ("watchdog: introduce separate handlers for parameters > in /proc/sys/kernel"), 866d62a433cc ("watchdog: enable the new user > interface of the watchdog mechanism") and 09d1b2261fcc ("watchdog: > clean up some function names and arguments") from the akpm-current tree. > > I fixed it up (see below, but it may need more work) and can carry the > fix as necessary (no action is required). Thanks for the fixups. I have removed the patch from the tile tree after rebasing it to the tip of linux-next so as to properly handle the just-updated refactoring in watchdog.c by Uli. It probably makes most sense if Andrew can pick it up once it has baked a bit longer on LKML and he can send it to you that way. -- Chris Metcalf, EZChip Semiconductor http://www.ezchip.com -- 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/