search for: 155,7

...edhat.com> --- include/uapi/linux/virtio_ring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index a3318f3..915980a 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) } /* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */ -/* Assuming a given event_idx value from the other size, if +/* Assuming a given event_idx value from the other side, if * we have just i...

...edhat.com> --- include/uapi/linux/virtio_ring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index a3318f3..915980a 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) } /* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */ -/* Assuming a given event_idx value from the other size, if +/* Assuming a given event_idx value from the other side, if * we have just i...

...-off-by: Michael S. Tsirkin <mst at redhat.com> --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f84fe04..c5b11f2 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -155,7 +155,7 @@ struct control_buf { u8 promisc; u8 allmulti; __virtio16 vid; - u64 offloads; + __virtio64 offloads; }; struct virtnet_info { -- MST

...uot;); @@ -127,7 +127,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) unload: qxl_device_fini(qdev); put_vga: - if (is_vga(pdev)) + if (is_vga(pdev) && pdev->revision < 5) vga_put(pdev, VGA_RSRC_LEGACY_IO); disable_pci: pci_disable_device(pdev); @@ -155,7 +155,7 @@ qxl_pci_remove(struct pci_dev *pdev) drm_dev_unregister(dev); drm_atomic_helper_shutdown(dev); - if (is_vga(pdev)) + if (is_vga(pdev) && pdev->revision < 5) vga_put(pdev, VGA_RSRC_LEGACY_IO); } -- 2.18.4

...-By: Jim Paris <jim at jtan.com> Signed-off-by: Ron Lee <ron at debian.org> --- tftpd/tftpd.8.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tftpd/tftpd.8.in b/tftpd/tftpd.8.in index b500d27..71a712d 100644 --- a/tftpd/tftpd.8.in +++ b/tftpd/tftpd.8.in @@ -155,7 +155,7 @@ or .B utimeout option is negotiated. The default is 1000000 (1 second.) .TP -\fB\-\-mapfile\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP +\fB\-\-map-file\fP \fIremap-file\fP, \fB\-m\fP \fIremap-file\fP Specify the use of filename remapping. The .I remap-file is a file contain...

...NULL, SHORT_OPTIONS_OPTION }, { "sparse", required_argument, NULL, 'S' }, { "synchronous", no_argument, NULL, SYNCHRONOUS_OPTION }, { "target-is-zero", no_argument, NULL, DESTINATION_IS_ZERO_OPTION }, @@ -155,7 +155,7 @@ main (int argc, char *argv[]) case HELP_OPTION: usage (stdout, EXIT_SUCCESS); - case LONG_OPTIONS: + case LONG_OPTIONS_OPTION: for (i = 0; long_options[i].name != NULL; ++i) { if (strcmp (long_options[i].name, "long-options") != 0 &&...

...ea0a401cedcfa426097a289d852971b14f1e # Parent d7d5078d08c711032837dcac79a4450226ec2ce5 nbdkit: Fix flags in old-style connection diff -r d7d5078d08c7 -r dbd1ea0a401c src/connections.c --- a/src/connections.c Sun Sep 25 05:04:02 2016 +0200 +++ b/src/connections.c Mon Sep 26 17:28:54 2016 +0200 @@ -155,7 +155,7 @@ struct old_handshake handshake; int64_t r; uint64_t exportsize; - uint16_t gflags, eflags; + uint32_t flags; int fl; r = plugin_get_size (conn); @@ -169,14 +169,13 @@ exportsize = (uint64_t) r; conn->exportsize = exportsize; - gflags = 0; - eflags = NBD_F...

...PTIONS_OPTION }, > { "sparse", required_argument, NULL, 'S' }, > { "synchronous", no_argument, NULL, SYNCHRONOUS_OPTION }, > { "target-is-zero", no_argument, NULL, DESTINATION_IS_ZERO_OPTION }, > @@ -155,7 +155,7 @@ main (int argc, char *argv[]) > case HELP_OPTION: > usage (stdout, EXIT_SUCCESS); > > - case LONG_OPTIONS: > + case LONG_OPTIONS_OPTION: > for (i = 0; long_options[i].name != NULL; ++i) { > if (strcmp (long_options[i].name, "...

...nk ? Which brings me back to this option, which may be the simplest and avoids the overhead of the proposed series (I found the series to be a nice cleanup but retpoline does kick us in the nuts here). So what about this ? --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -155,7 +155,7 @@ static bool vring_use_dma_api(struct virtio_device *vdev) * the DMA API if we're a Xen guest, which at least allows * all of the sensible Xen configurations to work correctly. */ - if (xen_domain()) + if (xen_domain() || arch_virtio_direct_dma_...

...nk ? Which brings me back to this option, which may be the simplest and avoids the overhead of the proposed series (I found the series to be a nice cleanup but retpoline does kick us in the nuts here). So what about this ? --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -155,7 +155,7 @@ static bool vring_use_dma_api(struct virtio_device *vdev) * the DMA API if we're a Xen guest, which at least allows * all of the sensible Xen configurations to work correctly. */ - if (xen_domain()) + if (xen_domain() || arch_virtio_direct_dma_...

...-- i/lib/test-fork-safe-execvpe.sh +++ w/lib/test-fork-safe-execvpe.sh @@ -18,7 +18,7 @@ . ../tests/functions.sh -set -e +set -ex # Determine the absolute pathname of the execvpe helper binary. The "realpath" # utility is not in POSIX, but Linux, FreeBSD and OpenBSD all have it. @@ -155,7 +155,7 @@ success() # Create a temporary directory and change the working directory to it. tmpd=$(mktemp -d) -cleanup_fn rm -r -- "$tmpd" +#cleanup_fn rm -r -- "$tmpd" cd "$tmpd" # If the "file" parameter of execvpe() is an empty string, then we must...

From: Ron <ron at debian.org> Hi, I've just taken over maintaining the packages for this in Debian, and we've been carrying a couple of patches for a while now that really should have been forwarded since they're clearly not distro specific. I added a third one to that yesterday to fix another autoconf build 'race' seen when doing parallel builds. Cheers, Ron

Another vga_switcheroo cleanup. Maintainers, is it okay to include the one-line change of each driver in here or do you want that split into separate patches? Thanks, Lukas Lukas Wunner (1): vga_switcheroo: Constify vga_switcheroo_handler drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-

Hi, When I do the "make install-tools" with xen-4.2-unstable, there are some errors about "warn_unused_result". Is it the error in code or the error in the compiling environment? Thank you so much. gcc -O1 -fno-omit-frame-pointer -m64 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement -D__XEN_TOOLS__ -MMD -MF .tapdisk-queue.o.d

...nux/virtio_ring.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h > index a3318f3..915980a 100644 > --- a/include/uapi/linux/virtio_ring.h > +++ b/include/uapi/linux/virtio_ring.h > @@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) > } > > /* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */ > -/* Assuming a given event_idx value from the other size, if > +/* Assuming a given event_idx value from the other si...

...1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h > > index a3318f3..915980a 100644 > > --- a/include/uapi/linux/virtio_ring.h > > +++ b/include/uapi/linux/virtio_ring.h > > @@ -155,7 +155,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) > > } > > > > /* The following is used with USED_EVENT_IDX and AVAIL_EVENT_IDX */ > > -/* Assuming a given event_idx value from the other size, if > > +/* Assuming a given event_id...

..._SYMBOL(pv_lock_ops); - -struct static_key paravirt_ticketlocks_enabled = STATIC_KEY_INIT_FALSE; -EXPORT_SYMBOL(paravirt_ticketlocks_enabled); diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index e8a9ea7..a822606 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c @@ -155,7 +155,6 @@ static __init int xen_init_spinlocks_jump(void) if (!xen_domain()) return 0; - static_key_slow_inc(&paravirt_ticketlocks_enabled); return 0; } early_initcall(xen_init_spinlocks_jump); -- 1.8.3.1

...uot;); @@ -124,7 +124,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) unload: qxl_device_fini(qdev); put_vga: - if (is_vga(pdev)) + if (is_vga(pdev) && pdev->revision < 5) vga_put(pdev, VGA_RSRC_LEGACY_IO); disable_pci: pci_disable_device(pdev); @@ -155,7 +155,7 @@ qxl_pci_remove(struct pci_dev *pdev) drm_dev_unregister(dev); drm_atomic_helper_shutdown(dev); - if (is_vga(pdev)) + if (is_vga(pdev) && pdev->revision < 5) vga_put(pdev, VGA_RSRC_LEGACY_IO); drm_dev_put(dev); } -- 2.18.2

It looks like older versions of lvm2 (recent enough to have selectors) do not recognize '1' (and '0') as boolean values. Switch to 'yes', which seems to be supported. Updates commit 7367945647e774aec4b93c3bf13181212d3c6430. --- daemon/lvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/lvm.c b/daemon/lvm.c index a270b13..c186a5a 100644 ---

...ot;dump_plugin")) { + if (script && callback_defined ("dump_plugin")) { ENTER; SAVETMPS; PUSHMARK (SP); diff --git a/plugins/python/python.c b/plugins/python/python.c index b105e53..83a32ea 100644 --- a/plugins/python/python.c +++ b/plugins/python/python.c @@ -155,7 +155,7 @@ py_dump_plugin (void) PyObject *fn; PyObject *r; - if (callback_defined ("dump_plugin", &fn)) { + if (script && callback_defined ("dump_plugin", &fn)) { PyErr_Clear (); r = PyObject_CallObject (fn, NULL); diff --git a/plugins/rub...