Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751210AbbBJP1s (ORCPT ); Tue, 10 Feb 2015 10:27:48 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:41697 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877AbbBJP1r (ORCPT ); Tue, 10 Feb 2015 10:27:47 -0500 Message-ID: <54DA2367.8020200@fb.com> Date: Tue, 10 Feb 2015 08:27:35 -0700 From: Jens Axboe User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= , , xen-devel , Konrad Rzeszutek Wilk , David Vrabel Subject: Re: [GIT PULL] (xen) for-jens-3.20 for v3.20 Xen blk driver updates References: <54DA0083.4010503@citrix.com> In-Reply-To: <54DA0083.4010503@citrix.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-02-10_05:2015-02-10,2015-02-10,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=0 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.925924926977281 urlsuspect_oldscore=0.925924926977281 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=64355 rbsscore=0.925924926977281 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1502100145 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1808 Lines: 45 On 02/10/2015 05:58 AM, Roger Pau Monné wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hello Jens, > > There are 3 fixes for Xen blk drivers. One adds myself as a maintainer > (together with Konrad). There's also one to improve compatibility with > older xen-blkfront versions that did not specify a protocol version. > The remaining one is a fix for blkfront to correctly account the > number of requests on the queue when resuming from suspension. > > Thanks, Roger. > > The following changes since commit > e36f014edff70fc02b3d3d79cead1d58f289332e: > > Linux 3.19-rc7 (2015-02-01 20:07:21 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-jens-3.20 This is based on 3.19-rc7, which means that when I pulled it into for-3.20/drivers, I get a ton of unrelated commits as well. That's no good. The pull request should be based on for-3.20/drivers or earlier. So please rebase the three patches on top of for-3.20/drivers. Konrad does the right thing here. Not sure if you are going to be sending pull requests going forward (or both of you), but it might not hurt to sync up with Konrad and ensure you guys are on the same page. Secondly, this is a bit late. But since it's just two fixes (not features) and a maintainer update, it's not a huge deal. It's a bit annoying though since every pull request like this will push my pull request by a day or two, so generally I prefer to have pull requests at least the week before the merge window opens. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/