search for: 146,10

...etting them. drivers/net/virtio_net.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 767ab11a6e9f..722ade567ee5 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -146,6 +146,10 @@ struct virtnet_info { virtio_net_ctrl_ack ctrl_status; u8 ctrl_promisc; u8 ctrl_allmulti; + + /* Ethtool settings */ + u8 duplex; + u32 speed; }; struct padded_vnet_hdr { @@ -1376,6 +1380,72 @@ static void virtnet_get_channels(struct net_device *dev, channels->other_coun...

...etting them. drivers/net/virtio_net.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 767ab11a6e9f..722ade567ee5 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -146,6 +146,10 @@ struct virtnet_info { virtio_net_ctrl_ack ctrl_status; u8 ctrl_promisc; u8 ctrl_allmulti; + + /* Ethtool settings */ + u8 duplex; + u32 speed; }; struct padded_vnet_hdr { @@ -1376,6 +1380,72 @@ static void virtnet_get_channels(struct net_device *dev, channels->other_coun...

...+++++++++++++++++++++++++++++++ >> 1 file changed, 74 insertions(+) >> >> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c >> index 767ab11a6e9f..722ade567ee5 100644 >> --- a/drivers/net/virtio_net.c >> +++ b/drivers/net/virtio_net.c >> @@ -146,6 +146,10 @@ struct virtnet_info { >> virtio_net_ctrl_ack ctrl_status; >> u8 ctrl_promisc; >> u8 ctrl_allmulti; >> + >> + /* Ethtool settings */ >> + u8 duplex; >> + u32 speed; >> }; >> >> struct padded_vnet_hdr { >> @@ -13...

...+++++++++++++++++++++++++++++++ >> 1 file changed, 74 insertions(+) >> >> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c >> index 767ab11a6e9f..722ade567ee5 100644 >> --- a/drivers/net/virtio_net.c >> +++ b/drivers/net/virtio_net.c >> @@ -146,6 +146,10 @@ struct virtnet_info { >> virtio_net_ctrl_ack ctrl_status; >> u8 ctrl_promisc; >> u8 ctrl_allmulti; >> + >> + /* Ethtool settings */ >> + u8 duplex; >> + u32 speed; >> }; >> >> struct padded_vnet_hdr { >> @@ -13...

...vers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -16,6 +16,7 @@ #include <drm/drm_drv.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_property.h> +#include <drm/drm_simple_kms_helper.h> #include <drm/drm_writeback.h> /** @@ -146,10 +147,6 @@ static int create_writeback_properties(struct drm_device *dev) return 0; } -static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { - .destroy = drm_encoder_cleanup, -}; - /** * drm_writeback_connector_init - Initialize a writeback connector and its properties *...

This patch goes with the node patch just sent, and is ready for pushing upstream. I'll be doing the blacklisting in a later patch once this is upstream.

...et.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 74 insertions(+) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 767ab11a6e9f..722ade567ee5 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -146,6 +146,10 @@ struct virtnet_info { > virtio_net_ctrl_ack ctrl_status; > u8 ctrl_promisc; > u8 ctrl_allmulti; > + > + /* Ethtool settings */ > + u8 duplex; > + u32 speed; > }; > > struct padded_vnet_hdr { > @@ -1376,6 +1380,72 @@ static void virtnet_get_cha...

...enum cache_mode cache_mode = CACHE_MODE_WRITEBACK; bool cache_on_read = false; @@ -132,6 +138,7 @@ cache_get_size (struct nbdkit_next_ops *next_ops, void *nxdata, void *handle) { int64_t size; + int r; size = next_ops->get_size (nxdata); if (size == -1) @@ -139,7 +146,10 @@ cache_get_size (struct nbdkit_next_ops *next_ops, void *nxdata, nbdkit_debug ("cache: underlying file size: %" PRIi64, size); - if (blk_set_size (size)) + pthread_mutex_lock (&lock); + r = blk_set_size (size); + pthread_mutex_unlock (&lock); + if (r == -1) r...

...</ins><span class="cx"> // LayoutConstraints are deprecated and not supported in WxRuby </span><span class="cx"> %ignore wxWindow::SetConstraints; </span><span class="cx"> </span><span class="lines">@@ -143,6 +146,10 @@ </span><span class="cx"> </span><span class="cx"> return returnVal; </span><span class="cx"> } </span><ins>+ + // pass a PaintDC into a passed ruby block, and ensure that the DC + // is correctly d...

...completion */ + mutex_unlock(&lock); + kfree(threads); + + return -EBUSY; /* canceled */ } int stop_machine_run(int (*fn)(void *), void *data, const cpumask_t *cpus) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2911665..3c7ca98 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -146,6 +146,10 @@ extern int no_unaligned_warning; extern int max_lock_depth; #endif +#ifdef CONFIG_STOP_MACHINE +extern unsigned long stopmachine_timeout; +#endif + #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp, void __user *buffer...

...completion */ + mutex_unlock(&lock); + kfree(threads); + + return -EBUSY; /* canceled */ } int stop_machine_run(int (*fn)(void *), void *data, const cpumask_t *cpus) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2911665..3c7ca98 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -146,6 +146,10 @@ extern int no_unaligned_warning; extern int max_lock_depth; #endif +#ifdef CONFIG_STOP_MACHINE +extern unsigned long stopmachine_timeout; +#endif + #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp, void __user *buffer...

...(void) Index: linux-2.6.16-rc5/arch/i386/kernel/reboot.c =================================================================== --- linux-2.6.16-rc5.orig/arch/i386/kernel/reboot.c 2006-03-08 11:34:53.000000000 -0800 +++ linux-2.6.16-rc5/arch/i386/kernel/reboot.c 2006-03-08 11:38:09.000000000 -0800 @@ -146,14 +146,10 @@ real_mode_gdt_entries [3] = 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ }; -static struct -{ - unsigned short size __attribute__ ((packed)); - unsigned long long * base __attribute__ ((packed)); -} -real_mode_gdt = { sizeof (real_mode_gdt_entries) -...

...(void) Index: linux-2.6.16-rc5/arch/i386/kernel/reboot.c =================================================================== --- linux-2.6.16-rc5.orig/arch/i386/kernel/reboot.c 2006-03-08 11:34:53.000000000 -0800 +++ linux-2.6.16-rc5/arch/i386/kernel/reboot.c 2006-03-08 11:38:09.000000000 -0800 @@ -146,14 +146,10 @@ real_mode_gdt_entries [3] = 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ }; -static struct -{ - unsigned short size __attribute__ ((packed)); - unsigned long long * base __attribute__ ((packed)); -} -real_mode_gdt = { sizeof (real_mode_gdt_entries) -...

...s are made at VM start/restore time # use pending here by default since this is used for queueing VM # creation/start operations diff --git a/src/app/models/vm_task.rb b/src/app/models/vm_task.rb index 762438f..649001d 100644 --- a/src/app/models/vm_task.rb +++ b/src/app/models/vm_task.rb @@ -146,10 +146,10 @@ class VmTask < Task end def self.action_privilege(action) - return ACTIONS[action][:privilege][0] + return ACTIONS[action].nil? ? nil : ACTIONS[action][:privilege][0] end def self.action_privilege_object(action, obj) - return obj.send(ACTIONS[action][:privile...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.

...} else { free((char*)head->link_u.idev); @@ -136,7 +137,7 @@ static void hard_link_one(char *hlink1, void do_hard_links(void) { #if SUPPORT_HARD_LINKS - struct file_struct *file; + struct file_struct *file, *first; char hlink1[MAXPATHLEN]; char *hlink2; STRUCT_STAT st1, st2; @@ -146,10 +147,10 @@ void do_hard_links(void) return; for (i = 0; i < hlink_count; i++) { - file = hlink_list[i]; - if (link_stat(f_name_to(file, hlink1), &st1) != 0) + first = file = hlink_list[i]; + if (link_stat(f_name_to(first, hlink1), &st1) != 0) continue; - while ((file =...

...le); + int (*can_extents) (struct nbdkit_next_ops *next_ops, void *nxdata, + void *handle); int (*can_fua) (struct nbdkit_next_ops *next_ops, void *nxdata, void *handle); int (*can_multi_conn) (struct nbdkit_next_ops *next_ops, void *nxdata, @@ -140,6 +146,10 @@ struct nbdkit_filter { int (*zero) (struct nbdkit_next_ops *next_ops, void *nxdata, void *handle, uint32_t count, uint64_t offset, uint32_t flags, int *err); + int (*extents) (struct nbdkit_next_ops *next_ops, void *nxdata, + void *handle,...

...le); + int (*can_extents) (struct nbdkit_next_ops *next_ops, void *nxdata, + void *handle); int (*can_fua) (struct nbdkit_next_ops *next_ops, void *nxdata, void *handle); int (*can_multi_conn) (struct nbdkit_next_ops *next_ops, void *nxdata, @@ -140,6 +146,10 @@ struct nbdkit_filter { int (*zero) (struct nbdkit_next_ops *next_ops, void *nxdata, void *handle, uint32_t count, uint64_t offset, uint32_t flags, int *err); + int (*extents) (struct nbdkit_next_ops *next_ops, void *nxdata, + void *handle,...