From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751764AbdBWX14 (ORCPT ); Thu, 23 Feb 2017 18:27:56 -0500 Received: from ozlabs.org ([103.22.144.67]:50107 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751736AbdBWX1z (ORCPT ); Thu, 23 Feb 2017 18:27:55 -0500 Date: Fri, 24 Feb 2017 10:17:46 +1100 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko , "David S. Miller" , Chris Wilson , Daniel Vetter Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20170224101746.75411e17@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 Dave, Today's linux-next merge of the drm tree got a conflict in: lib/Kconfig between commit: 44091d29f207 ("lib: Introduce priority array area manager") from Linus' tree and commit: cf4a7207b1cb ("lib: Add a simple prime number generator") from the drm 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 lib/Kconfig index f3552604e47a,1788a1f50d28..000000000000 --- a/lib/Kconfig +++ b/lib/Kconfig @@@ -550,7 -550,11 +550,14 @@@ config STACKDEPO config SBITMAP bool +config PARMAN + tristate + + config PRIME_NUMBERS + tristate "Prime number generator" + default n + help + Provides a helper module to generate prime numbers. Useful for writing + test code, especially when checking multiplication and divison. + endmenu