From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965918AbbBDXpp (ORCPT ); Wed, 4 Feb 2015 18:45:45 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:46932 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755909AbbBDXpn (ORCPT ); Wed, 4 Feb 2015 18:45:43 -0500 Date: Wed, 4 Feb 2015 23:45:36 +0000 From: Al Viro To: David Miller Cc: mst@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, cornelia.huck@de.ibm.com, rusty@rustcorp.com.au Subject: Re: [PATCH for-3.19] vhost/net: fix up num_buffers endian-ness Message-ID: <20150204234536.GL29656@ZenIV.linux.org.uk> References: <1422896842-19186-1-git-send-email-mst@redhat.com> <20150204.135942.127858058517785730.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150204.135942.127858058517785730.davem@davemloft.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 04, 2015 at 01:59:42PM -0800, David Miller wrote: > From: "Michael S. Tsirkin" > Date: Tue, 3 Feb 2015 11:07:06 +0200 > > > In virtio 1.0 mode, when mergeable buffers are enabled on a big-endian > > host, num_buffers wasn't byte-swapped correctly, so large incoming > > packets got corrupted. > > > > To fix, fill it in within hdr - this also makes sure it gets > > the correct type. > > > > Signed-off-by: Michael S. Tsirkin > > Applied. FWIW, conflict with iov_iter patches is trivial; once it shows up in your kernel.org tree I can either rebase the series or just push #merge-candidate - whichever you prefer. Linus usually prefers the second variant, but then he seriously dislikes rebasing of any sort; I've no idea what your preferences are in that area...