From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755655AbcHBB0R (ORCPT ); Mon, 1 Aug 2016 21:26:17 -0400 Received: from mail-oi0-f48.google.com ([209.85.218.48]:36132 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755556AbcHBB0O (ORCPT ); Mon, 1 Aug 2016 21:26:14 -0400 MIME-Version: 1.0 In-Reply-To: <20160802092450.36780125@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160727080845.12b58ebe@canb.auug.org.au> <20160802092450.36780125@canb.auug.org.au> From: Linus Torvalds Date: Mon, 1 Aug 2016 21:26:13 -0400 X-Google-Sender-Auth: dcxhXKoUEbUUbHKRnjYUT4UzUVY Message-ID: Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , Daniel Lezcano , linux-next , Linux Kernel Mailing List , Alexander Shiyan Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell wrote: > > This merge fix patch was missed when Linus merged the various bits of > the arm-soc tree overnight. :-( > > Here is the merge fix patch again: Thanks, applied. Linus From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Date: Mon, 1 Aug 2016 21:26:13 -0400 Message-ID: References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160727080845.12b58ebe@canb.auug.org.au> <20160802092450.36780125@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-oi0-f48.google.com ([209.85.218.48]:36132 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755556AbcHBB0O (ORCPT ); Mon, 1 Aug 2016 21:26:14 -0400 In-Reply-To: <20160802092450.36780125@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , Daniel Lezcano , linux-next , Linux Kernel Mailing List , Alexander Shiyan On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell wrote: > > This merge fix patch was missed when Linus merged the various bits of > the arm-soc tree overnight. :-( > > Here is the merge fix patch again: Thanks, applied. Linus From mboxrd@z Thu Jan 1 00:00:00 1970 From: torvalds@linux-foundation.org (Linus Torvalds) Date: Mon, 1 Aug 2016 21:26:13 -0400 Subject: linux-next: manual merge of the clockevents tree with the arm-soc tree In-Reply-To: <20160802092450.36780125@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160727080845.12b58ebe@canb.auug.org.au> <20160802092450.36780125@canb.auug.org.au> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell wrote: > > This merge fix patch was missed when Linus merged the various bits of > the arm-soc tree overnight. :-( > > Here is the merge fix patch again: Thanks, applied. Linus