linux-next: manual merge of the drm tree with Linus' tree

From: Stephen Rothwell
Date: Thu Feb 23 2017 - 18:28:09 EST

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:


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.

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

+config PARMAN
+ tristate
+ 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.