From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753971AbdEJUvO (ORCPT ); Wed, 10 May 2017 16:51:14 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:48419 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbdEJUvN (ORCPT ); Wed, 10 May 2017 16:51:13 -0400 Date: Wed, 10 May 2017 13:51:09 -0700 From: "Paul E. McKenney" To: Linus Torvalds Cc: Ingo Molnar , Linux Kernel Mailing List , Peter Zijlstra , Thomas Gleixner Subject: Re: [RFC GIT PULL, v2] RCU changes for v4.12 Reply-To: paulmck@linux.vnet.ibm.com References: <20170501095915.rm4zi5z4ta44il5p@gmail.com> <20170509072640.sbvhtjy7mcw7ndo3@gmail.com> <20170510195440.GW3956@linux.vnet.ibm.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-cbid: 17051020-0008-0000-0000-00000218A6F7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007044; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000210; SDB=6.00858820; UDB=6.00425579; IPR=6.00638294; BA=6.00005342; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015402; XFM=3.00000015; UTC=2017-05-10 20:51:09 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051020-0009-0000-0000-000035398955 Message-Id: <20170510205109.GX3956@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-10_17:,, 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-1703280000 definitions=main-1705100142 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 10, 2017 at 01:17:54PM -0700, Linus Torvalds wrote: > On Wed, May 10, 2017 at 12:54 PM, Paul E. McKenney > wrote: > > > > I am testing a merge with current linus/master, and I looked through > > the commits in -next selected by: > > > > gitk v4.11.. --no-merges --all-match --grep=drm --grep=selftest > > > > I didn't find anything obvious. If the tests complete successfully, > > I will try running the DRM selftest. > > The drivers/gpu/drm/i915/selftests/mock_gem_device.c had a new use of > SLAB_DESTROY_BY_RCU, which obviously conflicted with the rename to > SLAB_TYPESAFE_BY_RCU. > > It doesn't show up as a merge-time code conflict, only as a build-time > failure. It's why I do allmodconfig builds after every pull. That > doesn't catch everything (I only do it for x86-64, for example), but > it catches a lot. > > And no, it's not a problem. These things happen, and it's literally my > job to make sure my merges work out. > > I don't actually expect submaintainers to figure things like that out, > although this *did* show up in linux-next, and it's a bit > disappointing how that information got lost somewhere on the way. > > It kind of implies that the prep work that linux-next does doesn't get > fully used. I did see that from linux-next. For future reference, what should I have done with it? Added it to my pull request or to the commit log of my merge commit? > Normally I wouldn't even have mentioned it, if it wasn't for the fact > that I got a 300kB data dump in my mailbox, and that huge amount of > data wasn't actually even very relevant. Well, my testing did find a lockdep splat, so the effort was not wasted. ;-) Thanx, Paul