From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933522AbdCVACv (ORCPT ); Tue, 21 Mar 2017 20:02:51 -0400 Received: from ozlabs.org ([103.22.144.67]:48127 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757217AbdCVACN (ORCPT ); Tue, 21 Mar 2017 20:02:13 -0400 Date: Wed, 22 Mar 2017 11:00:50 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson , Jani Nikula Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20170322110050.1e2ea77d@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: drivers/gpu/drm/i915/i915_gem_shrinker.c between commit: 3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)") from the drm-intel-fixes tree and commit: 519d52498156 ("drm/i915: i915_gem_shrink_all() needs an awake device") 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 drivers/gpu/drm/i915/i915_gem_shrinker.c index d5d2b4c6ed38,006a8b908f77..000000000000 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@@ -263,7 -264,9 +264,9 @@@ unsigned long i915_gem_shrink_all(struc I915_SHRINK_BOUND | I915_SHRINK_UNBOUND | I915_SHRINK_ACTIVE); + intel_runtime_pm_put(dev_priv); + - rcu_barrier(); /* wait until our RCU delayed slab frees are completed */ + synchronize_rcu(); /* wait for our earlier RCU delayed slab frees */ return freed; } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Wed, 22 Mar 2017 11:00:50 +1100 Message-ID: <20170322110050.1e2ea77d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Jani Nikula , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org SGkgRGF2ZSwKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUgZ290IGEg Y29uZmxpY3QgaW46CgogIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMK CmJldHdlZW4gY29tbWl0OgoKICAzZDNkMThmMDg2Y2QgKCJkcm0vaTkxNTogQXZvaWQgcmN1X2Jh cnJpZXIoKSBmcm9tIHJlY2xhaW0gcGF0aHMgKHNocmlua2VyKSIpCgpmcm9tIHRoZSBkcm0taW50 ZWwtZml4ZXMgdHJlZSBhbmQgY29tbWl0OgoKICA1MTlkNTI0OTgxNTYgKCJkcm0vaTkxNTogaTkx NV9nZW1fc2hyaW5rX2FsbCgpIG5lZWRzIGFuIGF3YWtlIGRldmljZSIpCgpmcm9tIHRoZSBkcm0g dHJlZS4KCkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFz IG5lY2Vzc2FyeS4gVGhpcwppcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29u Y2VybmVkLCBidXQgYW55IG5vbiB0cml2aWFsCmNvbmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVk IHRvIHlvdXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZQppcyBzdWJtaXR0ZWQg Zm9yIG1lcmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZwp3 aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmltaXNlIGFu eSBwYXJ0aWN1bGFybHkKY29tcGxleCBjb25mbGljdHMuCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJv dGh3ZWxsCgpkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIu YwppbmRleCBkNWQyYjRjNmVkMzgsMDA2YThiOTA4Zjc3Li4wMDAwMDAwMDAwMDAKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCkBAQCAtMjYzLDcgLTI2NCw5ICsyNjQsOSBAQEAg dW5zaWduZWQgbG9uZyBpOTE1X2dlbV9zaHJpbmtfYWxsKHN0cnVjCiAgCQkJCUk5MTVfU0hSSU5L X0JPVU5EIHwKICAJCQkJSTkxNV9TSFJJTktfVU5CT1VORCB8CiAgCQkJCUk5MTVfU0hSSU5LX0FD VElWRSk7CisgCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKyAKIC0JcmN1X2JhcnJp ZXIoKTsgLyogd2FpdCB1bnRpbCBvdXIgUkNVIGRlbGF5ZWQgc2xhYiBmcmVlcyBhcmUgY29tcGxl dGVkICovCiArCXN5bmNocm9uaXplX3JjdSgpOyAvKiB3YWl0IGZvciBvdXIgZWFybGllciBSQ1Ug ZGVsYXllZCBzbGFiIGZyZWVzICovCiAgCiAgCXJldHVybiBmcmVlZDsKICB9Cl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=