linux-kernel - linux-next: manual merge of the vhost tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150708114307.3da73865@canb.auug.org.au>
Date:	Wed, 8 Jul 2015 11:43:07 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Michael S. Tsirkin" <mst@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gerd Hoffmann <kraxel@...hat.com>
Subject: linux-next: manual merge of the vhost tree with Linus' tree

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in:

  MAINTAINERS

between commit:

  4ad6ee91aa9f ("Add MAINTAINERS entry for virtio-gpu")

from Linus' tree and commit:

  f2dbda3b4fc2 ("MAINTAINERS: separate section for s390 virtio drivers")

from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc MAINTAINERS
index d558d280fdc1,fbef7d0a4dd5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10895,15 -10570,15 +10894,24 @@@ F:	drivers/block/virtio_blk.
  F:	include/linux/virtio_*.h
  F:	include/uapi/linux/virtio_*.h
  
+ VIRTIO DRIVERS FOR S390
+ M:	Christian Borntraeger <borntraeger@...ibm.com>
+ M:	Cornelia Huck <cornelia.huck@...ibm.com>
+ L:	linux-s390@...r.kernel.org
+ L:	virtualization@...ts.linux-foundation.org
+ L:	kvm@...r.kernel.org
+ S:	Supported
+ F:	drivers/s390/virtio/
+ 
 +VIRTIO GPU DRIVER
 +M:	David Airlie <airlied@...ux.ie>
 +M:	Gerd Hoffmann <kraxel@...hat.com>
 +L:	dri-devel@...ts.freedesktop.org
 +L:	virtualization@...ts.linux-foundation.org
 +S:	Maintained
 +F:	drivers/gpu/drm/virtio/
 +F:	include/uapi/linux/virtio_gpu.h
 +
  VIRTIO HOST (VHOST)
  M:	"Michael S. Tsirkin" <mst@...hat.com>
  L:	kvm@...r.kernel.org

Content of type "application/pgp-signature" skipped