From: Sage Weil <sage@redhat.com>
Date: Sat, 9 Mar 2019 15:29:33 +0000 (-0600)
Subject: Merge PR #26660 into master
X-Git-Tag: v14.1.1~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c32921d7ea05e01752d0c9ed1140229ea58ca933;p=ceph.git

Merge PR #26660 into master

* refs/pull/26660/head:
	include/intarith: enforce the same type for p2*() arguments

Reviewed-by: Sage Weil <sage@redhat.com>
---

c32921d7ea05e01752d0c9ed1140229ea58ca933