[PATCH] staging: lustre: declare fiemap_for_stripe static

Declare fiemap_for_stripe as static to fix sparse warnings: > warning: symbol 'fiemap_for_stripe' was not declared. Should it be > static? Signed-off-by: David Wittman --- drivers/staging/lustre/lustre/lov/lov_object.c | 10 +- 1 file changed, 5 insertions(+), 5

[PATCH net-next v3 3/3] netvsc: remove bonding setup script

No longer needed, now all managed by transparent VF logic. Signed-off-by: Stephen Hemminger --- tools/hv/bondvf.sh | 255 - 1 file changed, 255 deletions(-) delete mode 100755 tools/hv/bondvf.sh diff --git

[PATCH net-next v3 1/3] netvsc: transparent VF management

This patch implements transparent fail over from synthetic NIC to SR-IOV virtual function NIC in Hyper-V environment. It is a better alternative to using bonding as is done now. Instead, the receive and transmit fail over is done internally inside the driver. Using bonding driver has lots of

[PATCH net-next v3 2/3] netvsc: add documentation

Add some background documentation on netvsc device options and limitations. Signed-off-by: Stephen Hemminger --- Documentation/networking/netvsc.txt | 63 + MAINTAINERS | 1 + 2 files changed, 64 insertions(+)

[PATCH net-next v3 0/3] netvsc: transparent VF support

This patch set changes how SR-IOV Virtual Function devices are managed in the Hyper-V network driver. This version is rebased onto current net-next. Background In Hyper-V SR-IOV can be enabled (and disabled) by changing guest settings on host. When SR-IOV is enabled a matching PCI device is hot

Re: [PATCH net 6/7] netvsc: Initialize 64-bit stats seqcount

On Tue, 1 Aug 2017 12:11:12 -0700 Florian Fainelli wrote: > On 32-bit hosts and with CONFIG_DEBUG_LOCK_ALLOC we should be seeing a > lockdep splat indicating this seqcount is not correctly initialized, fix > that. In commit 6c80f3fc2398 ("netvsc: report per-channel stats

[PATCH v1] staging:rtl8188eu:core Add spaces around &,+,-

This Patch is to solve coding style issues, Major changes to add Space around &,+,-. Major pending is to fix CamelCase Signed-off-by: Ashish Kalra --- drivers/staging/rtl8188eu/core/rtw_ap.c | 65 +++-- 1 file changed, 29 insertions(+), 36

[PATCH] staging: vboxvideo: use drm_gem_object_put instead of drm_gem_object_unreference

drm_gem_object_unreference is a compatibility alias for drm_gem_object_put so should not be used by new code. This patch fixes the following warning reported by coccinelle: drivers/staging/vboxvideo/vbox_main.c:528:1-27: WARNING: use get/put helpers to reference and dereference obj

Re: [PATCH net-next v2 0/3] netvsc: transparent SR-IOV VF support

From: Stephen Hemminger Date: Mon, 31 Jul 2017 16:45:21 -0700 > This patch set changes how SR-IOV Virtual Function devices are managed > in the Hyper-V network driver. It was part of earlier bundle, but > is now updated. I think you need to do a rebase. I just

[PATCH] staging: lustre: grab the cld->cld_lock mutex unconditionally

Instead of using the locked variable as a helper to determine the state of the mutex cld->cld_lock, expand the scope of the recover_cld variable and assign to the cld->cld_recover variable depending on whether the value of the recover_cld variable is valid or not. As a bonus, code size is

Re: [PATCH] staging: ks7010: fix styling WARNINGs

The subject is too vague and you need a changelog. On Tue, Aug 01, 2017 at 05:11:29PM +0100, Ashish Kalra wrote: > +static int inc_txqhead(struct ks_wlan_private *priv) > +{ > + priv->tx_dev.qhead = (priv->tx_dev.qhead + 1) % TX_DEVICE_BUFF_SIZE; > + return 0; Just make these void if no

[PATCH 5/5] staging/pi433/rf69_enum.h:Removed Coding style issues from pi433_if.h and other dependencies arising from it.

Signed-off-by: Rishabh Hardas --- drivers/staging/pi433/rf69_enum.h | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/pi433/rf69_enum.h b/drivers/staging/pi433/rf69_enum.h index fbfb59b..f51eec3 100644 ---

[PATCH 3/5] staging/pi433/rf69.h:Removed Coding style issues from pi433_if.h and other dependencies arising from it.

Signed-off-by: Rishabh Hardas --- drivers/staging/pi433/rf69.h | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h index b81e076..e98e24e 100644 ---

[PATCH 4/5] staging/pi433/rf69.c:Removed Coding style issues from pi433_if.h and other dependencies arising from it.

Signed-off-by: Rishabh Hardas --- drivers/staging/pi433/rf69.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c index f83523e..7fa63e1 100644 ---

[PATCH 1/5] staging/pi433:Removed Coding style issues from pi433_if.h and other dependencies arising from it.

This is a 5 patch series which solves coding style issues as marked by checkpatch.pl in the file pi433_if.h and contains changes that have to be made in other files as a consequence of the changes made in pi433_if.h Signed-off-by: Rishabh Hardas ---

[PATCH 2/5] staging/pi433/pi433_if.c:Removed Coding style issues from pi433_if.h and other dependencies arising from it.

Signed-off-by: Rishabh Hardas --- drivers/staging/pi433/pi433_if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index ed737f4..11c042b 100644 ---

[PATCH net 6/7] netvsc: Initialize 64-bit stats seqcount

On 32-bit hosts and with CONFIG_DEBUG_LOCK_ALLOC we should be seeing a lockdep splat indicating this seqcount is not correctly initialized, fix that. In commit 6c80f3fc2398 ("netvsc: report per-channel stats in ethtool statistics") netdev_alloc_pcpu_stats() was removed in favor of open-coding the

[PATCH net 6/7] netvsc: Initialize 64-bit stats seqcount

On 32-bit hosts and with CONFIG_DEBUG_LOCK_ALLOC we should be seeing a lockdep splat indicating this seqcount is not correctly initialized, fix that. In commit 6c80f3fc2398 ("netvsc: report per-channel stats in ethtool statistics") netdev_alloc_pcpu_stats() was removed in favor of open-coding the

RE: [PATCH v2] staging: unisys: Switch to use new generic UUID API

> -Original Message- > From: Andy Shevchenko [mailto:andriy.shevche...@linux.intel.com] > Sent: Monday, July 31, 2017 1:19 PM > Subject: [PATCH v2] staging: unisys: Switch to use new generic UUID API > > There are new types and helpers that are supposed to be used in new code. > > As a

[PATCH] staging: vboxvideo: select DRM_TTM

vboxvideo code uses various ttm_* functions, so it needs "drivers/gpu/drm/ttm/*" to be built. In order to build these objects select DRM_TTM. This commit fixes "ttm_*" undefined build errors. Signed-off-by: Cihangir Akturk --- drivers/staging/vboxvideo/Kconfig | 1 + 1 file

[PATCH v2]staging: ks7010: fix styling WARNINGs

Signed-off-by: Ashish Kalra Trivial style changes. There are still "line over 80 characters" checkpatch.pl warnings, but I think they are best left alone as breaking these could hurt readability v2: Updated Patch as per review comments recievd ---

Re: [PATCH v2] Staging: greybus: Match alignment with open parenthesis.

On 28/07/17 20:50, Shreeya Patel wrote: Alignment should match with open parenthesis. I was going to crib about the use of parenthesis instead of parentheses... but as the man would say that would be #sad #sosad So - thanks for taking the time to send this patch. This fixes the coding style

Re: [PATCH] staging: ks7010: fix styling WARNINGs

On Tue, 2017-08-01 at 17:11 +0100, Ashish Kalra wrote: > Signed-off-by: Ashish Kalra Still many issues with this patch submission: o no commit message o no version of patch submission in subject line And other issues below: > --- > drivers/staging/ks7010/ks7010_sdio.c

[PATCH] staging: ks7010: fix styling WARNINGs

Signed-off-by: Ashish Kalra --- drivers/staging/ks7010/ks7010_sdio.c | 47 +--- 1 file changed, 33 insertions(+), 14 deletions(-) Trivial style changes. There are still "line over 80 characters" checkpatch.pl warnings, but I think they are

[PATCH 29/45] staging: unisys: Move SIOVM guid to visorbus

The SIOVM guid is only used by visorchipset. So define it there instead of a global header file. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 02/45] staging: unisys: include: iochannel.h: Removed unused DEFINE

From: Zohaib Javed Removed unused #define GPI_ENTRIES_PER_PAGE Signed-off-by: Zohaib Javed Signed-off-by: David Kershner Reviewed-by: David Binder Reviewed-by: Tim Sell

[PATCH 19/45] staging: unisys: include: cleanup channel comment

A comment in channel.h was referencing windows guests, in reality the OS of the guest is agnostic and the comment should reflect that. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 20/45] staging: unisys: include: Fix up comment style in visorbus.h

Visorbus.h had comments that did not have /* on its own line, this patch makes it uniform. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 27/45] staging: unisys: include: remove unnecessary blank line from channel.h

Remove unnecessary blank line from channel.h #defines. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/include/channel.h | 1 - 1 file changed, 1

[PATCH 37/45] staging: unisys: visorinput: visorinput.c: Remove filename in top comment

From: David Binder Removes unnecessary filename in the top file comment. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 35/45] staging: unisys: visorbus: visorbus_main.c: Remove filename in top comment

From: David Binder Removes unnecessary filename in the top file comment. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 34/45] staging: unisys: visorbus: visorchipset.c: Fix SonarQube sprintf findings

From: David Binder Fixes two sprintf invocations where we attempt to format an unsigned integer as a signed integer. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 40/45] staging: unisys: visorinput: ultrainputreport.h: Adjust comment formatting

From: David Binder The first line of the top file comment should begin on the line following the block comment opening, thereby following the convention used elsewhere in the driver set. Signed-off-by: David Binder Signed-off-by: David Kershner

[PATCH 41/45] staging: unisys: include: iochannel.h: Add proper copyright statement

From: David Binder Adds the proper Unisys copyright statement to the top of iochannel.h. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 30/45] staging: unisys: visorbus: Remove confusing comment in controlvmchannel.

Referencing a SegmentIndex doesn't make sense in the Linux drivers, get rid of the comment. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 33/45] staging: unisys: visorbus: Get rid of passthrough function visorchipset_bus_create

The function visorchipset_bus_create just called visorbus_create_instance, we should just combine it with visorbus_create_instance. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 44/45] staging: unisys: visorbus: Get rid of passthrough function visorchipset_device_destroy

From: Sameer Wadgaonkar The function visorchipset_device_destroy just called remove_visor_device, we can just combine it with remove_visor_device. Signed-off-by: Sameer Wadgaonkar Signed-off-by: David Kershner

[PATCH 43/45] staging: unisys: visorbus: Get rid of passthrough function visorchipset_device_create

From: Sameer Wadgaonkar The function visorchipset_device_create just called create_visor_device, we can just combine it with create_visor_device. Signed-off-by: Sameer Wadgaonkar Signed-off-by: David Kershner

[PATCH 31/45] staging: unisys: don't copy to local variable

Do the check with the values in the structure instead of copying them to local variables. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 42/45] staging: unisys: visorbus: Get rid of passthrough function visorchipset_bus_destroy

From: Sameer Wadgaonkar The function visorchipset_bus_destroy just called viosrbus_remove_instance, we can just combine it with visorbus_remove_instance. Signed-off-by: Sameer Wadgaonkar Signed-off-by: David Kershner

[PATCH 45/45] staging: unisys: use ATTRIBUTE_GROUPS instead of creating our own

Greg noticed that we were creating our own attribute groups, instead of using the ATTRIBUTE_GROUPS macro, this patch fixes our mistake. Reported-by: Greg Kroah-Hartman Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 38/45] staging: unisys: include: visorbus.h: Remove filename in top comment

From: David Binder Removes unnecessary filename in the top file comment. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 39/45] staging: unisys: visorhba: Adjust top comment formatting

From: David Binder The first line of the top file comment should begin on the line following the block comment opening, thereby following the convention used elsewhere in the driver set. Signed-off-by: David Binder Signed-off-by: David Kershner

[PATCH 22/45] staging: unisys: include: Remove unneeded includes from visorbus.h

A bunch of code churn has caused the following include files to not be needed by visorbus.h: linux/poll.h linux/kernel.h linux/uuid.h linux/seq_file.h Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 11/45] staging: unisys: include: fix improper use of dma_data_direction

From: Steven Matthews Replace use of standard Linux dma_data_direction with a Unisys- specific uis_dma_data_direction and provide a function to convert from the latter to the former. This is necessary because Unisys s-Par depends on the exact format of this field in

[PATCH 36/45] staging: unisys: visorbus: visorchannel.c: Remove filename in top comment

From: David Binder Removes unnecessary filename in the top file comment. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 18/45] staging: unisys: include: Remove unused throttling defines.

We no longer send messages directly to the s-Par event log, so we do not need the throttling defines anymore. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 32/45] staging: unisys: reference bus_no and dev_no directly

Don't store it in a local variable but reference it from the visor_device. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/visorbus/visorchipset.c |

[PATCH 26/45] staging: unisys: visorinput: Get rid of unused includes

Cleanups caused us to not need to include a bunch of headers, got rid of them. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 12/45] staging: unisys: visorbus: merging the visorbus_*_response functions into one.

From: Sameer Wadgaonkar The functions visorbus_create_response(), visorbus_destroy_response(), viosrbus_device_create_response(), viosrbus_device_destroy_response() are all functionally similar. Merging these four functions into a single function called

[PATCH 21/45] staging: unisys: include: Remove unnecessary forward declaration

The struct visor_device had a forward declaration that was not needed. Remove it. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/include/visorbus.h

[PATCH 05/45] staging: unisys: visorbus: visorbus_private.h remove filename

From: Mark Foresta Remove the filename in the comment at the beginning of the file. Signed-off-by: Mark Foresta Signed-off-by: David Kershner Reviewed-by: David Binder Reviewed-by: Tim Sell

[PATCH 07/45] staging: unisys: visornic: update the struct viosrnic_devdata comments

From: Sameer Wadgaonkar Cleaned up the in-line comments in the structure and added a single block comment for the structure. Signed-off-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: David

[PATCH 24/45] staging: unisys: visorbus: Remove unnecessary includes for visorchipset.c

Visorchipset.c was including unnecessary include files, either included by other headers or not needed at all. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 08/45] staging: unisys: visornic: visornic_main.c: fix multiline dereference.

From: Sameer Wadgaonkar This patch fixes two checkpatch warnings in the visornic_main.c file to avoid multiline dereference. Signed-off-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim

[PATCH 28/45] staging: unisys: Move VNIC GUID to visornic

Instead of including it in the global channel.h, move the VNIC GUID to the visornic module. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 01/45] staging: unisys: visorbus: remove filename from beginning of file

From: Zohaib Javed The filename was in a comment at the beginning of the file. It is not needed. Signed-off-by: Zohaib Javed Signed-off-by: David Kershner Reviewed-by: David Binder

[PATCH 04/45] staging: unisys: visorbus: Update comment style vbuschannel.h

From: Mark Foresta Moved blocked comment on to own line at beginning of struct to follow standard. Since this is an internal structure, the block comment isn't actually a kernel-doc so we only start the block with one asterisk. Signed-off-by: Mark Foresta

[PATCH 23/45] staging: unisys: visorbus: fix include dependency

Due to include order, the visorbus_private.h file was missing a required include header visorbus.h. If visorchipset.c or visorbus_main.c ever were to change the order of the includes for visobus.h and visorbus_private.h, the code would fail to compile. Reviewed-by: Sameer Wadgaonkar

[PATCH 14/45] staging: unisys: include: Remove unused #define MAXNUM

The MAXNUM #define was not being used, and it shouldn't be used. Remove it. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/include/iochannel.h | 1 -

[PATCH 17/45] staging: unisys: include: Remove unused vdiskmgmt commands

The vdisk task management commands are no longer used by s-Par, this patch removes the definitions for them. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 25/45] staging: unisys: include: iochannel needs to include skbuff

The iochannel.h header file references ETH_HLEN which is defined in skbuff. Removed it from visorhba since it was no longer needed. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell

[PATCH 16/45] staging: unisys: include: iochannel.h: Update comments for #defines

Cleaned up some #defines to make the beginning of the file read easier. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/include/iochannel.h | 10

[PATCH 15/45] staging: unisys: use the kernel min define

The kernel already provides a min function, we should be using that instead of creating our own MINNUM. Reviewed-by: Sameer Wadgaonkar Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 13/45] staging: unisys: visorbus: merging the visorbus_device_pause_response and visorbus_device_resume_response functions into one.

From: Sameer Wadgaonkar The functions viosrbus_device_pause_response() and viosrbus_device_resume_response() are functionally similar. Merging these functions into a single function called visorbus_device_changestate_response(). Signed-off-by: Sameer Wadgaonkar

[PATCH 09/45] staging: unisys: visorbus: Merge vmcallinterface.h into visorchipset.c

From: David Binder The contents of vmcallinterface.h are better placed within visorchipset.c from an organizational perspective. The values are only used in that file. Signed-off-by: David Binder Signed-off-by: David Kershner

[PATCH 06/45] staging: unisys: visorbus: fix multi-line function definition

From: Charles Daniels Fixed incorrectly styled function definitions in visorbus/visorchipset.c by placing the function names on the same line as the return. Signed-off-by: Charles Daniels Signed-off-by: David Kershner

[PATCH 10/45] staging: unisys: visorbus: Remove unnecessary comments

From: David Binder Removes comments that do not provide any valuable information. Signed-off-by: David Binder Signed-off-by: David Kershner Reviewed-by: Tim Sell ---

[PATCH 03/45] staging: unisys: visorbus: Adding a new line between function definition

From: Zohaib Javed Added a new line before issue_vmcall_io_controlvm_addr() function definition. Signed-off-by: Zohaib Javed Signed-off-by: David Kershner Reviewed-by: David Binder

[PATCH 00/45] staging: unisys: more changes to the code.

The following patch series addresses issues from internal code-review as well as checkpatch errors and suggestions from GregKH. We have updated our commenting style to be more readable (and adopted a kernel-doc like format). We have intentionally not made them kernel-doc by removing the extra

Re: [PATCH] staging/ccree: Declare compiled out fuctions static inline

On Mon, Jul 31, 2017 at 12:17 PM, RishabhHardas wrote: > From: RishabhHardas > > Sparse was giving out a warning for symbols 'cc_set_ree_fips_status' and > 'fips_handler' > that they were not declared and need to be made static. This patch

[bug report] staging: lustre: lov: Ensure correct operation for large object sizes

Hello Nathaniel Clark, The patch 476f575cf070: "staging: lustre: lov: Ensure correct operation for large object sizes" from Jul 26, 2017, leads to the following static checker warning: drivers/staging/lustre/lustre/lov/lov_ea.c:207 lsm_unpackmd_common() warn: signed overflow

[PATCH v3] staging: octeon: fix line over 80 characters

From: John Smith ethernet-rx.c: fix WARNING: line over 80 characters The code was restructured a bit, a helper function was added to cvm_oct_poll. Signed-off-by: John Smith --- Changes since version 2: - silenced build warning

[PATCH V2 2/2] staging:rtl8188eu:core Fix Avoid CamelCase

This patch is created to solve CamelCase issue. The variables 'IEs' and 'IELength' of struct wlan_bssid_ex are replaced with 'ies' and 'ie_length' to solve the CamelCase issue and these changes are applied to all the places where these variables are referenced inside the rtl8188eu driver.

Re: [sm750fb] Sunix 2D VGA controller causes kernel panic and crash on boot

Hi, I added staging mailing list and Greg to Cc: (sm750fb driver is a part of STAGING subsystem,, not FBDEV one). On Tuesday, August 01, 2017 08:44:42 AM Tommy Giesler wrote: > I have recently submitted a bug report to the Ubuntu bugtracker, since > one of our test installations of Ubuntu

[PATCH 2/2] staging:rtl8188eu:core Fix Avoid CamelCase

This patch is created to solve CamelCase issue. The members 'IEs' and 'IELength' of struct wlan_bssid_ex are modified to 'ies' and 'ielength' to solve CamelCase. And all the places where these variables are referenced inside rtl8188eu driver are also changed. ---

Re: [PATCH] staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING

On Fri, Jul 28, 2017 at 04:22:31PM +0100, Ian Abbott wrote: > Comedi's read and write file operation handlers (`comedi_read()` and > `comedi_write()`) currently call `copy_to_user()` or `copy_from_user()` > whilst in the `TASK_INTERRUPTIBLE` state, which falls foul of the > `might_fault()` checks

[PATCH] staging:rtl8188eu:core Add spaces around

This patch is created to solve the coding style issues reported by the checkpatch script. Signed-off-by: Janani Sankara Babu --- drivers/staging/rtl8188eu/core/rtw_ap.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git