From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbdBZLiB (ORCPT ); Sun, 26 Feb 2017 06:38:01 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:60754 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752031AbdBZLhy (ORCPT ); Sun, 26 Feb 2017 06:37:54 -0500 Date: Sun, 26 Feb 2017 13:37:44 +0200 From: Mike Rapoport To: Linus Torvalds Cc: Shuah Khan , Mike Kravetz , Stephen Rothwell , linux-kselftest@vger.kernel.org, LKML , "davem@davemloft.net" Subject: Re: [GIT PULL] Kselftest update for 4.11-rc1 References: <5355691a-e765-51d9-d6ab-cc5310fa30f0@osg.samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022611-0008-0000-0000-000003F01299 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022611-0009-0000-0000-00001C981409 Message-Id: <20170226113744.GA17152@rapoport-lnx> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-26_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702260120 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Feb 25, 2017 at 03:42:55PM -0800, Linus Torvalds wrote: > On Fri, Feb 24, 2017 at 1:09 PM, Shuah Khan wrote: > > > > Stephen saw a conflict during kselftest merge with next > [..] > > There was also a conflict with some of Andrew's new userfaultfd tests. > > I'm not at all sure I merged that correctly, although I tried to make > the resolution at least look sane. The odd thing about those new tests > is that it's all the same source file, except built with different > compile-time defines to be different test binaries. > > I didn't find any way to do that with any standard selftest makefile > magic, so I just did the build rules by hand. > > Somebody should actually verify that it does the right thing, please.. > Adding the two Mike's that did those test additions to the participant > list. The userfaultfd_* tests are built and they are working just fine. Maybe it's worth adding userfaultfd_{hugetlb,shmem}.c which will define the required defines and include userfaultfd.c? Than we can get away with only specifying LDFLAGS += -lpthread in the Makefile. > Linus > -- Sincerely yours, Mike.