From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397AbcAFDnu (ORCPT ); Tue, 5 Jan 2016 22:43:50 -0500 Received: from ozlabs.org ([103.22.144.67]:52296 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969AbcAFDns (ORCPT ); Tue, 5 Jan 2016 22:43:48 -0500 Date: Wed, 6 Jan 2016 14:43:46 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Yoshinori Sato Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Lezcano Subject: linux-next: manual merge of the tip tree with the h8300 tree Message-ID: <20160106144346.199bdc3c@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/h8300/Kconfig between commit: ff2b670fcb7b ("h8300: KGDB support") from the h8300 tree and commit: 97a23beb8db9 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/h8300/Kconfig index dc99ee1a86cf,2e20333cbce9..000000000000 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@@ -17,8 -17,7 +17,9 @@@ config H830 select HAVE_MEMBLOCK select HAVE_DMA_ATTRS select CLKSRC_OF + select HAVE_ARCH_KGDB + select HAVE_KERNEL_LZO + select H8300_TMR8 config RWSEM_GENERIC_SPINLOCK def_bool y