| Message ID | 1451392796-30956-1-git-send-email-caoj.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 29 Dec 2015, Stefan Weil wrote: > Am 29.12.2015 um 13:39 schrieb Cao jin: > > merge last two lines, keep alphabetic order. > > > > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > > --- > > hw/xen/Makefile.objs | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs > > index a9ad7e7..d367094 100644 > > --- a/hw/xen/Makefile.objs > > +++ b/hw/xen/Makefile.objs > > @@ -2,5 +2,4 @@ > > common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o > > > > obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o > > -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o > > -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o xen_pt_graphics.o > > +obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o > > > > Thanks. > > Reviewed-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Stefan, do you want me to pick this up or are you going to apply it to trivial?
29.12.2015 15:39, Cao jin wrote:
> merge last two lines, keep alphabetic order.
Applied to -trivial, thank you!
/mjt
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index a9ad7e7..d367094 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -2,5 +2,4 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o -obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o xen_pt_graphics.o +obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o
merge last two lines, keep alphabetic order. Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- hw/xen/Makefile.objs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)