| Message ID | 1518650290-31536-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| Headers | show |
| Series | Linux upstream kernel backports and updates | expand |
Pravin, thank you for integrating Greg's 4.14 series. We'd like to release OVS 2.9 in the next couple of days. Would you be able to look at this series and see if it's appropriate to bring into OVS 2.9? I'm sorry for the short notice, but it doesn't look like it should be too bad a series. I understand if you won't have a chance, though. Can you just let me know? Thanks! --Justin > On Feb 14, 2018, at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: > > Pull in the remaining available upstream bug fixes for the openvswitch > Linux kernel datapath. In addition, allow building the openvswitch > OOT kernel datapath on kernels up to and including Linux kernel release > 4.15. > > Travis build is here - Note that the errors are not related to this > patch series: > > https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 > > The patches can be pulled from here in case that is easier for review. > > https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 > > The patches are based on commit in the master branch: > f50c1eb4a6 ("docs: Update supported DPDK versions.") > > After this series the remaining upstream patches for openvswitch are > all erspan related. The erspan patches will be sent separately at a > later date. > > Christopher Díaz Riveros (1): > datapath: Remove unneeded semicolons > > Ed Swierk (1): > datapath: Remove padding from packet before L3+ conntrack processing > > Eric Garver (1): > datapath: Fix pop_vlan action for double tagged frames > > Greg Rose (2): > acinclude: Enable building for Linux kernel 4.15 > travis: Update Linux kernel test list > > Julia Lawall (1): > datapath: drop unneeded newline > > Yang Shi (1): > datapath: remove unused hardirq.h > > paolo abeni (1): > datapath: do not propagate headroom updates to internal port > > .travis.yml | 13 +++++++------ > acinclude.m4 | 4 ++-- > datapath/conntrack.c | 38 ++++++++++++++++++++++++++++++++++++-- > datapath/flow.c | 15 ++++++++++++--- > datapath/flow_netlink.c | 4 ++-- > datapath/vport-internal_dev.c | 20 +------------------- > 6 files changed, 60 insertions(+), 34 deletions(-) > > -- > 1.8.3.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
On Wed, Feb 14, 2018 at 11:09 PM, Justin Pettit <jpettit@ovn.org> wrote: > Pravin, thank you for integrating Greg's 4.14 series. We'd like to release OVS 2.9 in the next couple of days. Would you be able to look at this series and see if it's appropriate to bring into OVS 2.9? I'm sorry for the short notice, but it doesn't look like it should be too bad a series. I understand if you won't have a chance, though. Can you just let me know? > ok, I will try to finish it today. Thanks, Pravin. > Thanks! > > --Justin > > >> On Feb 14, 2018, at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: >> >> Pull in the remaining available upstream bug fixes for the openvswitch >> Linux kernel datapath. In addition, allow building the openvswitch >> OOT kernel datapath on kernels up to and including Linux kernel release >> 4.15. >> >> Travis build is here - Note that the errors are not related to this >> patch series: >> >> https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 >> >> The patches can be pulled from here in case that is easier for review. >> >> https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 >> >> The patches are based on commit in the master branch: >> f50c1eb4a6 ("docs: Update supported DPDK versions.") >> >> After this series the remaining upstream patches for openvswitch are >> all erspan related. The erspan patches will be sent separately at a >> later date. >> >> Christopher Díaz Riveros (1): >> datapath: Remove unneeded semicolons >> >> Ed Swierk (1): >> datapath: Remove padding from packet before L3+ conntrack processing >> >> Eric Garver (1): >> datapath: Fix pop_vlan action for double tagged frames >> >> Greg Rose (2): >> acinclude: Enable building for Linux kernel 4.15 >> travis: Update Linux kernel test list >> >> Julia Lawall (1): >> datapath: drop unneeded newline >> >> Yang Shi (1): >> datapath: remove unused hardirq.h >> >> paolo abeni (1): >> datapath: do not propagate headroom updates to internal port >> >> .travis.yml | 13 +++++++------ >> acinclude.m4 | 4 ++-- >> datapath/conntrack.c | 38 ++++++++++++++++++++++++++++++++++++-- >> datapath/flow.c | 15 ++++++++++++--- >> datapath/flow_netlink.c | 4 ++-- >> datapath/vport-internal_dev.c | 20 +------------------- >> 6 files changed, 60 insertions(+), 34 deletions(-) >> >> -- >> 1.8.3.1 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Wed, Feb 14, 2018 at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: > Pull in the remaining available upstream bug fixes for the openvswitch > Linux kernel datapath. In addition, allow building the openvswitch > OOT kernel datapath on kernels up to and including Linux kernel release > 4.15. > > Travis build is here - Note that the errors are not related to this > patch series: > > https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 > > The patches can be pulled from here in case that is easier for review. > > https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 > > The patches are based on commit in the master branch: > f50c1eb4a6 ("docs: Update supported DPDK versions.") > > After this series the remaining upstream patches for openvswitch are > all erspan related. The erspan patches will be sent separately at a > later date. > > Christopher Díaz Riveros (1): > datapath: Remove unneeded semicolons > > Ed Swierk (1): > datapath: Remove padding from packet before L3+ conntrack processing > > Eric Garver (1): > datapath: Fix pop_vlan action for double tagged frames > > Greg Rose (2): > acinclude: Enable building for Linux kernel 4.15 > travis: Update Linux kernel test list > > Julia Lawall (1): > datapath: drop unneeded newline > > Yang Shi (1): > datapath: remove unused hardirq.h > > paolo abeni (1): > datapath: do not propagate headroom updates to internal port > All patches looks good to me. I pushed all patches to master. I also backport following three patches to branch 2.8 and 2.9:- datapath: do not propagate headroom updates to internal port datapath: Fix pop_vlan action for double tagged frames datapath: Remove padding from packet before L3+ conntrack processing Thanks, Pravin.
> On Feb 16, 2018, at 12:52 AM, Pravin Shelar <pshelar@ovn.org> wrote: > > On Wed, Feb 14, 2018 at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: >> Pull in the remaining available upstream bug fixes for the openvswitch >> Linux kernel datapath. In addition, allow building the openvswitch >> OOT kernel datapath on kernels up to and including Linux kernel release >> 4.15. >> >> Travis build is here - Note that the errors are not related to this >> patch series: >> >> https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 >> >> The patches can be pulled from here in case that is easier for review. >> >> https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 >> >> The patches are based on commit in the master branch: >> f50c1eb4a6 ("docs: Update supported DPDK versions.") >> >> After this series the remaining upstream patches for openvswitch are >> all erspan related. The erspan patches will be sent separately at a >> later date. >> >> Christopher Díaz Riveros (1): >> datapath: Remove unneeded semicolons >> >> Ed Swierk (1): >> datapath: Remove padding from packet before L3+ conntrack processing >> >> Eric Garver (1): >> datapath: Fix pop_vlan action for double tagged frames >> >> Greg Rose (2): >> acinclude: Enable building for Linux kernel 4.15 >> travis: Update Linux kernel test list >> >> Julia Lawall (1): >> datapath: drop unneeded newline >> >> Yang Shi (1): >> datapath: remove unused hardirq.h >> >> paolo abeni (1): >> datapath: do not propagate headroom updates to internal port >> > All patches looks good to me. I pushed all patches to master. > > I also backport following three patches to branch 2.8 and 2.9:- > datapath: do not propagate headroom updates to internal port > datapath: Fix pop_vlan action for double tagged frames > datapath: Remove padding from packet before L3+ conntrack processing Thanks, Pravin! Will support for building against Linux 4.15 apply cleanly to branch-2.9? Do you have any concerns about our doing that? --Justin
On 2/16/2018 12:52 AM, Pravin Shelar wrote: > On Wed, Feb 14, 2018 at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: >> Pull in the remaining available upstream bug fixes for the openvswitch >> Linux kernel datapath. In addition, allow building the openvswitch >> OOT kernel datapath on kernels up to and including Linux kernel release >> 4.15. >> >> Travis build is here - Note that the errors are not related to this >> patch series: >> >> https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 >> >> The patches can be pulled from here in case that is easier for review. >> >> https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 >> >> The patches are based on commit in the master branch: >> f50c1eb4a6 ("docs: Update supported DPDK versions.") >> >> After this series the remaining upstream patches for openvswitch are >> all erspan related. The erspan patches will be sent separately at a >> later date. >> >> Christopher Díaz Riveros (1): >> datapath: Remove unneeded semicolons >> >> Ed Swierk (1): >> datapath: Remove padding from packet before L3+ conntrack processing >> >> Eric Garver (1): >> datapath: Fix pop_vlan action for double tagged frames >> >> Greg Rose (2): >> acinclude: Enable building for Linux kernel 4.15 >> travis: Update Linux kernel test list >> >> Julia Lawall (1): >> datapath: drop unneeded newline >> >> Yang Shi (1): >> datapath: remove unused hardirq.h >> >> paolo abeni (1): >> datapath: do not propagate headroom updates to internal port >> > All patches looks good to me. I pushed all patches to master. > > I also backport following three patches to branch 2.8 and 2.9:- > datapath: do not propagate headroom updates to internal port > datapath: Fix pop_vlan action for double tagged frames > datapath: Remove padding from packet before L3+ conntrack processing > > Thanks, > Pravin. Fantastic! Thank you Pravin!! - Greg
On Fri, Feb 16, 2018 at 1:44 AM, Justin Pettit <jpettit@ovn.org> wrote: > > >> On Feb 16, 2018, at 12:52 AM, Pravin Shelar <pshelar@ovn.org> wrote: >> >> On Wed, Feb 14, 2018 at 3:18 PM, Greg Rose <gvrose8192@gmail.com> wrote: >>> Pull in the remaining available upstream bug fixes for the openvswitch >>> Linux kernel datapath. In addition, allow building the openvswitch >>> OOT kernel datapath on kernels up to and including Linux kernel release >>> 4.15. >>> >>> Travis build is here - Note that the errors are not related to this >>> patch series: >>> >>> https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 >>> >>> The patches can be pulled from here in case that is easier for review. >>> >>> https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 >>> >>> The patches are based on commit in the master branch: >>> f50c1eb4a6 ("docs: Update supported DPDK versions.") >>> >>> After this series the remaining upstream patches for openvswitch are >>> all erspan related. The erspan patches will be sent separately at a >>> later date. >>> >>> Christopher Díaz Riveros (1): >>> datapath: Remove unneeded semicolons >>> >>> Ed Swierk (1): >>> datapath: Remove padding from packet before L3+ conntrack processing >>> >>> Eric Garver (1): >>> datapath: Fix pop_vlan action for double tagged frames >>> >>> Greg Rose (2): >>> acinclude: Enable building for Linux kernel 4.15 >>> travis: Update Linux kernel test list >>> >>> Julia Lawall (1): >>> datapath: drop unneeded newline >>> >>> Yang Shi (1): >>> datapath: remove unused hardirq.h >>> >>> paolo abeni (1): >>> datapath: do not propagate headroom updates to internal port >>> >> All patches looks good to me. I pushed all patches to master. >> >> I also backport following three patches to branch 2.8 and 2.9:- >> datapath: do not propagate headroom updates to internal port >> datapath: Fix pop_vlan action for double tagged frames >> datapath: Remove padding from packet before L3+ conntrack processing > > Thanks, Pravin! Will support for building against Linux 4.15 apply cleanly to branch-2.9? Do you have any concerns about our doing that? > At this point 2.9 supports 4.13, so we will need to pull in patch series for 4.14 and 4.15 to the branch 2.9. OVS 2.9 missing datapath features like NSH and metering, available in upstream kernel 4.14 and 4.15, is that ok?
> On Feb 16, 2018, at 1:25 PM, Pravin Shelar <pshelar@ovn.org> wrote: > > On Fri, Feb 16, 2018 at 1:44 AM, Justin Pettit <jpettit@ovn.org> wrote: >> > At this point 2.9 supports 4.13, so we will need to pull in patch > series for 4.14 and 4.15 to the branch 2.9. > OVS 2.9 missing datapath features like NSH and metering, available in > upstream kernel 4.14 and 4.15, is that ok? There were some patches that reference 4.14 in branch-2.9, but now I see that full support wasn't added. How straight-forward is it to backport support 4.14 and 4.15 without NSH and metering? NEWS in branch-2.9 claims NSH support for the kernel, and it looks like there are nsh files in "datapath/linux". Is there a difference in support between them? --Justin
On Fri, Feb 16, 2018 at 2:16 PM, Justin Pettit <jpettit@ovn.org> wrote: > > >> On Feb 16, 2018, at 1:25 PM, Pravin Shelar <pshelar@ovn.org> wrote: >> >> On Fri, Feb 16, 2018 at 1:44 AM, Justin Pettit <jpettit@ovn.org> wrote: >>> >> At this point 2.9 supports 4.13, so we will need to pull in patch >> series for 4.14 and 4.15 to the branch 2.9. >> OVS 2.9 missing datapath features like NSH and metering, available in >> upstream kernel 4.14 and 4.15, is that ok? > > There were some patches that reference 4.14 in branch-2.9, but now I see that full support wasn't added. How straight-forward is it to backport support 4.14 and 4.15 without NSH and metering? NEWS in branch-2.9 claims NSH support for the kernel, and it looks like there are nsh files in "datapath/linux". Is there a difference in support between them? > Sorry, I misread it, NSH is in 2.9. I think rest of patches should be easy to backport those patches, I can work on it tomorrow.
> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: > > Sorry, I misread it, NSH is in 2.9. > I think rest of patches should be easy to backport those patches, I > can work on it tomorrow. If it's not too bad, that would be great. Thank you very much! --Justin
> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: > > >> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >> >> Sorry, I misread it, NSH is in 2.9. >> I think rest of patches should be easy to backport those patches, I >> can work on it tomorrow. > > If it's not too bad, that would be great. Thank you very much! Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! --Justin
> On Feb 19, 2018, at 9:50 AM, Justin Pettit <jpettit@ovn.org> wrote: > > >> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: >> >> >>> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>> >>> Sorry, I misread it, NSH is in 2.9. >>> I think rest of patches should be easy to backport those patches, I >>> can work on it tomorrow. >> >> If it's not too bad, that would be great. Thank you very much! > > Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! Don't worry about getting this into branch-2.9. We had to release 2.9.0 due to others' release commitments. Unless there's a strong need to get it into branch-2.9, we'll just wait for 2.10.0. Thanks, --Justin
On Mon, Feb 19, 2018 at 3:23 PM, Justin Pettit <jpettit@ovn.org> wrote: > >> On Feb 19, 2018, at 9:50 AM, Justin Pettit <jpettit@ovn.org> wrote: >> >> >>> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: >>> >>> >>>> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>>> >>>> Sorry, I misread it, NSH is in 2.9. >>>> I think rest of patches should be easy to backport those patches, I >>>> can work on it tomorrow. >>> >>> If it's not too bad, that would be great. Thank you very much! >> >> Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! > > Don't worry about getting this into branch-2.9. We had to release 2.9.0 due to others' release commitments. Unless there's a strong need to get it into branch-2.9, we'll just wait for 2.10.0. > Hi Justin, I am done with backporting the patches. I need to run sanity tests with kernel 4.14 and 4.15. I could push it in couple of hours given I do not find any issues. If it is too late we can push those patches for later release in 2.9. Let me know. Thanks, Pravin.
> On Feb 19, 2018, at 4:30 PM, Pravin Shelar <pshelar@ovn.org> wrote: > > On Mon, Feb 19, 2018 at 3:23 PM, Justin Pettit <jpettit@ovn.org> wrote: >> >>> On Feb 19, 2018, at 9:50 AM, Justin Pettit <jpettit@ovn.org> wrote: >>> >>> >>>> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: >>>> >>>> >>>>> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>>>> >>>>> Sorry, I misread it, NSH is in 2.9. >>>>> I think rest of patches should be easy to backport those patches, I >>>>> can work on it tomorrow. >>>> >>>> If it's not too bad, that would be great. Thank you very much! >>> >>> Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! >> >> Don't worry about getting this into branch-2.9. We had to release 2.9.0 due to others' release commitments. Unless there's a strong need to get it into branch-2.9, we'll just wait for 2.10.0. >> > > Hi Justin, > I am done with backporting the patches. I need to run sanity tests > with kernel 4.14 and 4.15. I could push it in couple of hours given I > do not find any issues. If it is too late we can push those patches > for later release in 2.9. Thanks, Pravin. The 2.9.0 release is basically ready other than sending out the announcement. You can go ahead and push the changes to branch-2.9 whenever you're ready, and we'll pick them up in the next release. --Justin
> On Feb 20, 2018, at 1:16 AM, Justin Pettit <jpettit@ovn.org> wrote: > >> On Feb 19, 2018, at 4:30 PM, Pravin Shelar <pshelar@ovn.org> wrote: >> >> On Mon, Feb 19, 2018 at 3:23 PM, Justin Pettit <jpettit@ovn.org> wrote: >>> >>>> On Feb 19, 2018, at 9:50 AM, Justin Pettit <jpettit@ovn.org> wrote: >>>> >>>> >>>>> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: >>>>> >>>>> >>>>>> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>>>>> >>>>>> Sorry, I misread it, NSH is in 2.9. >>>>>> I think rest of patches should be easy to backport those patches, I >>>>>> can work on it tomorrow. >>>>> >>>>> If it's not too bad, that would be great. Thank you very much! >>>> >>>> Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! >>> >>> Don't worry about getting this into branch-2.9. We had to release 2.9.0 due to others' release commitments. Unless there's a strong need to get it into branch-2.9, we'll just wait for 2.10.0. >>> >> >> Hi Justin, >> I am done with backporting the patches. I need to run sanity tests >> with kernel 4.14 and 4.15. I could push it in couple of hours given I >> do not find any issues. If it is too late we can push those patches >> for later release in 2.9. > > Thanks, Pravin. The 2.9.0 release is basically ready other than sending out the announcement. You can go ahead and push the changes to branch-2.9 whenever you're ready, and we'll pick them up in the next release. Hi, Pravin. I just wanted to check whether you've had a chance to finish this up. Thanks, --Justin
On Mon, Mar 5, 2018 at 8:29 PM, Justin Pettit <jpettit@ovn.org> wrote: > >> On Feb 20, 2018, at 1:16 AM, Justin Pettit <jpettit@ovn.org> wrote: >> >>> On Feb 19, 2018, at 4:30 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>> >>> On Mon, Feb 19, 2018 at 3:23 PM, Justin Pettit <jpettit@ovn.org> wrote: >>>> >>>>> On Feb 19, 2018, at 9:50 AM, Justin Pettit <jpettit@ovn.org> wrote: >>>>> >>>>> >>>>>> On Feb 16, 2018, at 5:32 PM, Justin Pettit <jpettit@ovn.org> wrote: >>>>>> >>>>>> >>>>>>> On Feb 16, 2018, at 5:31 PM, Pravin Shelar <pshelar@ovn.org> wrote: >>>>>>> >>>>>>> Sorry, I misread it, NSH is in 2.9. >>>>>>> I think rest of patches should be easy to backport those patches, I >>>>>>> can work on it tomorrow. >>>>>> >>>>>> If it's not too bad, that would be great. Thank you very much! >>>>> >>>>> Hi, Pravin. Have you had a chance to work on this? I'm just trying to figure out when to release 2.9. Thanks! >>>> >>>> Don't worry about getting this into branch-2.9. We had to release 2.9.0 due to others' release commitments. Unless there's a strong need to get it into branch-2.9, we'll just wait for 2.10.0. >>>> >>> >>> Hi Justin, >>> I am done with backporting the patches. I need to run sanity tests >>> with kernel 4.14 and 4.15. I could push it in couple of hours given I >>> do not find any issues. If it is too late we can push those patches >>> for later release in 2.9. >> >> Thanks, Pravin. The 2.9.0 release is basically ready other than sending out the announcement. You can go ahead and push the changes to branch-2.9 whenever you're ready, and we'll pick them up in the next release. > > Hi, Pravin. I just wanted to check whether you've had a chance to finish this up. > right, I have already done with the testing, I forgot to push it. Thanks for reminding me.
> On Mar 5, 2018, at 10:59 PM, Pravin Shelar <pshelar@ovn.org> wrote: > > right, I have already done with the testing, I forgot to push it. > Thanks for reminding me. Thanks for pushing it! --Justin
Pull in the remaining available upstream bug fixes for the openvswitch Linux kernel datapath. In addition, allow building the openvswitch OOT kernel datapath on kernels up to and including Linux kernel release 4.15. Travis build is here - Note that the errors are not related to this patch series: https://travis-ci.org/gvrose8192/ovs-experimental/builds/341649151 The patches can be pulled from here in case that is easier for review. https://github.com/gvrose8192/ovs-experimental/tree/linux-4.15 The patches are based on commit in the master branch: f50c1eb4a6 ("docs: Update supported DPDK versions.") After this series the remaining upstream patches for openvswitch are all erspan related. The erspan patches will be sent separately at a later date. Christopher Díaz Riveros (1): datapath: Remove unneeded semicolons Ed Swierk (1): datapath: Remove padding from packet before L3+ conntrack processing Eric Garver (1): datapath: Fix pop_vlan action for double tagged frames Greg Rose (2): acinclude: Enable building for Linux kernel 4.15 travis: Update Linux kernel test list Julia Lawall (1): datapath: drop unneeded newline Yang Shi (1): datapath: remove unused hardirq.h paolo abeni (1): datapath: do not propagate headroom updates to internal port .travis.yml | 13 +++++++------ acinclude.m4 | 4 ++-- datapath/conntrack.c | 38 ++++++++++++++++++++++++++++++++++++-- datapath/flow.c | 15 ++++++++++++--- datapath/flow_netlink.c | 4 ++-- datapath/vport-internal_dev.c | 20 +------------------- 6 files changed, 60 insertions(+), 34 deletions(-)