svn commit: r365091 - in head/sys/dev/virtio: . balloon block console network scsi

[John Baldwin]

On 9/1/20 2:31 PM, Mateusz Guzik wrote:
> Author: mjg
> Date: Tue Sep  1 21:31:26 2020
> New Revision: 365091
> URL: https://svnweb.freebsd.org/changeset/base/365091
> 
> Log:
>   virtio: clean up empty lines in .c and .h files
> 
> Modified:
>   head/sys/dev/virtio/balloon/virtio_balloon.c
>   head/sys/dev/virtio/block/virtio_blk.c
>   head/sys/dev/virtio/console/virtio_console.c
>   head/sys/dev/virtio/network/if_vtnet.c
>   head/sys/dev/virtio/scsi/virtio_scsi.c
>   head/sys/dev/virtio/virtio.c
> 
> Modified: head/sys/dev/virtio/balloon/virtio_balloon.c
> ==============================================================================
> --- head/sys/dev/virtio/balloon/virtio_balloon.c	Tue Sep  1 21:30:22 2020	(r365090)
> +++ head/sys/dev/virtio/balloon/virtio_balloon.c	Tue Sep  1 21:31:26 2020	(r365091)
> @@ -80,7 +80,6 @@ struct vtballoon_softc {
>  static struct virtio_feature_desc vtballoon_feature_desc[] = {
>  	{ VIRTIO_BALLOON_F_MUST_TELL_HOST,	"MustTellHost"	},
>  	{ VIRTIO_BALLOON_F_STATS_VQ,		"StatsVq"	},
> -
>  	{ 0, NULL }
>  };

While many of the fixes are correct, I feel that this one (along with similar
changes to remove a blank line before table terminators in devmethod tables,
or in tables in the acpi drivers I saw in acpi_support) are a regression.

Also, in general some kind of heads up to ask before generating umpteen
billion merge conflicts would be nice.

-- 
John Baldwin