From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755076AbdGKAEa (ORCPT ); Mon, 10 Jul 2017 20:04:30 -0400 Received: from ozlabs.org ([103.22.144.67]:49419 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754832AbdGKAE2 (ORCPT ); Mon, 10 Jul 2017 20:04:28 -0400 Date: Tue, 11 Jul 2017 10:04:25 +1000 From: Stephen Rothwell To: Ralf Baechle , James Hogan Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Paul Burton , Tero Kristo , Stephen Boyd Subject: linux-next: manual merge of the mips tree with Linus' tree Message-ID: <20170711100425.3faaf38b@canb.auug.org.au> 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 mips tree got a conflict in: drivers/clk/Kconfig between commit: b745c0794e2f ("clk: keystone: Add sci-clk driver support") from Linus' tree and commit: 5e2722808156 ("clk: boston: Add a driver for MIPS Boston board clocks") from the mips tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/clk/Kconfig index d406b087553f,251a22139e73..000000000000 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@@ -221,7 -219,7 +221,8 @@@ config COMMON_CLK_VC source "drivers/clk/bcm/Kconfig" source "drivers/clk/hisilicon/Kconfig" + source "drivers/clk/imgtec/Kconfig" +source "drivers/clk/keystone/Kconfig" source "drivers/clk/mediatek/Kconfig" source "drivers/clk/meson/Kconfig" source "drivers/clk/mvebu/Kconfig"