4.1.3-stable review
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest63 of 65 patches 6 repliesIn review
63 of 65 patches are in this archive. The cover letter announces 65.
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/65 | fs: Add helper functions for permanently empty directories.fs/ include/ | +98 | 0 replies | |
| 2/65 | sysctl: Allow creating permanently empty directories that serve as mountpoints.fs/ include/ kernel/ | +41 | 0 replies | |
| 3/65 | proc: Allow creating permanently empty directories that serve as mount pointsfs/ fs/ fs/ +1 more | +35 | 0 replies | |
| 4/65 | kernfs: Add support for always empty directories.fs/ fs/ include/ | +42 | 0 replies | |
| 5/65 | sysfs: Add support for permanently empty directories to serve as mount points.fs/ include/ | +49 | 0 replies | |
| 6/65 | sysfs: Create mountpoints with sysfs_create_mount_pointarch/ drivers/ fs/ +8 more | +40 | 0 replies | |
| 7/65 | mnt: Update fs_fully_visible to test for permanently empty directoriesfs/ | +2 | 0 replies | |
| 8/65 | mnt: Refactor the logic for mounting sysfs and proc in a user namespacefs/ fs/ fs/ +1 more | +10 | 0 replies | |
| 9/65 | mnt: Modify fs_fully_visible to deal with locked ro nodev and atimefs/ | +21 | 0 replies | |
| 10/65 | gpio: crystalcove: set IRQCHIP_SKIP_SET_WAKE for the irqchipdrivers/ | +1 | 0 replies | |
| 11/65 | gpio: rcar: Check for irq_set_irq_wake() failuresdrivers/ | +10 | 0 replies | |
| 12/65 | rcu: Correctly handle non-empty Tiny RCU callback list with none readykernel/ | +5 | 0 replies | |
| 13/65 | ipr: Increase default adapter init stage change timeoutdrivers/ | +1 | 0 replies | |
| 14/65 | Disable write buffering on Toshiba ToPIC95drivers/ | +16 | 0 replies | |
| 15/65 | ALSA: pcm: Fix pcm_class sysfs outputsound/ | +3 | 0 replies | |
| 16/65 | ALSA: hda - Fix Dock Headphone on Thinkpad X250 seen as a Line Outsound/ | +7 | 0 replies | |
| 17/65 | ALSA: hda - set proper caps for newer AMD hda audio in KB/KVsound/ | +4 | 0 replies | |
| 18/65 | ALSA: hda - Disable widget power-save for VIA codecssound/ | +5 | 0 replies | |
| 19/65 | ALSA: hda - restore the MIC FIXUP for some Dell machinessound/ | +17 | 0 replies | |
| 20/65 | ALSA: hda - Add headset support to Acer Aspire V5sound/ | +12 | 0 replies | |
| 21/65 | ALSA: hda - Fix the dock headphone output on Fujitsu Lifebook E780sound/ | +6 | 0 replies | |
| 22/65 | ALSA: hda - Add a fixup for Dell E7450sound/ | +1 | 0 replies | |
| 23/65 | ACPI / init: Switch over platform to the ACPI mode laterdrivers/ include/ init/ | +44 | 0 replies | |
| 24/65 | ACPI / PM: Add missing pm_generic_complete() invocationdrivers/ | +1 | 0 replies | |
| 25/65 | ACPI / PNP: Avoid conflicting resource reservationsdrivers/ drivers/ drivers/ +1 more | +197 | 0 replies | |
| 26/65 | iio: accel: kxcjk-1013: add the "KXCJ9000" ACPI iddrivers/ | +1 | 0 replies | |
| 27/65 | tools selftests: Fix clean target with make 3.81tools/ | +1 | 0 replies | |
| 28/65 | ARC: add smp barriers around atomics per Documentation/atomic_ops.txtarch/ arch/ arch/ +1 more | +89 | 0 replies | |
| 29/65 | ARC: add compiler barrier to LLSC based cmpxchgarch/ | +5 | 0 replies | |
| 30/65 | arc: fix use of uninitialized arc_pmuarch/ | +0 | 0 replies | |
| 31/65 | power_supply: Fix NULL pointer dereference during bq27x00_battery probedrivers/ | +10 | 0 replies | |
| 32/65 | power_supply: Fix possible NULL pointer dereference on early ueventdrivers/ include/ | +46 | 0 replies | |
| 33/65 | mei: me: wait for power gating exit confirmationdrivers/ drivers/ drivers/ +1 more | +80 | 0 replies | |
| 34/65 | mei: txe: reduce suspend/resume timedrivers/ | +10 | 0 replies | |
| 35/65 | arm64: Do not attempt to use init_mm in reset_context()arch/ | +8 | 0 replies | |
| 36/65 | arm64: entry: fix context tracking for el0_sp_pcarch/ | +1 | 0 replies | |
| 37/65 | arm64: mm: Fix freeing of the wrong memmap entries with !SPARSEMEM_VMEMMAParch/ | +1 | 0 replies | |
| 38/65 | arm64: vdso: work-around broken ELF toolchains in Makefilearch/ | +4 | 0 replies | |
| 39/65 | mm: kmemleak: allow safe memory scanning during kmemleak disablingmm/ | +16 | 0 replies | |
| 40/65 | mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()include/ mm/ mm/ | +10 | 0 replies | |
| 41/65 | mm, thp: respect MPOL_PREFERRED policy with non-local nodemm/ | +22 | 0 replies | |
| 42/65 | regmap: Fix regmap_bulk_read in BE modedrivers/ | +1 | 0 replies | |
| 43/65 | regmap: Fix possible shift overflow in regmap_field_init()drivers/ | +1 | 0 replies | |
| 44/65 | regulator: max77686: fix gpio_enabled shift wrapping bugdrivers/ | +3 | 0 replies | |
| 45/65 | regulator: core: fix constraints output bufferdrivers/ | +1 | 0 replies | |
| 46/65 | livepatch: add module locking around kallsyms callskernel/ | +13 | 0 replies | |
| 48/65 | spi: orion: Fix maximum baud rates for Armada 370/XPdrivers/ | +23 | 0 replies | |
| 49/65 | spi: pl022: Specify num-cs property as required in devicetree bindingDocumentation/ | +1 | 0 replies | |
| 50/65 | scsi_transport_srp: Introduce srp_wait_for_queuecommand()drivers/ | +31 | 0 replies | |
| 51/65 | scsi_transport_srp: Fix a race conditiondrivers/ | +3 | 0 replies | |
| 52/65 | IB/srp: Remove an extraneous scsi_host_put() from an error pathdrivers/ | +5 | 0 replies | |
| 53/65 | IB/srp: Fix a connection setup racedrivers/ | +3 | 0 replies | |
| 54/65 | IB/srp: Fix connection state trackingdrivers/ drivers/ | +30 | 0 replies | |
| 55/65 | IB/srp: Fix reconnection failure handlingdrivers/ | +1 | 0 replies | |
| 56/65 | genirq: devres: Fix testing return value of request_any_context_irq()kernel/ | +2 | 0 replies | |
| 57/65 | video: mxsfb: Make sure axi clock is enabled when accessing registersdrivers/ | +54 | 0 replies | |
| 58/65 | leds / PM: fix hibernation on arm when gpio-led used with CPU led triggerdrivers/ | +3 | 0 replies | |
| 59/65 | mtd: fix: avoid race condition when accessing mtd->usecountdrivers/ | +5 | 0 replies | |
| 61/65 | PCI: Propagate the "ignore hotplug" setting to parentdrivers/ include/ | +12 | 0 replies | |
| 62/65 | PCI: Add pci_bus_addr_tDocumentation/ Documentation/ drivers/ +4 more | +66 | 0 replies | |
| 63/65 | PCI: pciehp: Wait for hotplug command completion where necessarydrivers/ | +38 | 0 replies | |
| 64/65 | of/pci: Fix pci_address_to_pio() conversion of CPU address to I/O portdrivers/ | +1 | 0 replies | |
| 65/65 | Input: pixcir_i2c_ts - fix receive errordrivers/ | +1 | 0 replies |
Reviews trailers per patch
18 of 63 patches have a Reviewed-by or Acked-by.
| Patch | Peter Zijlstra (Intel) | Liviu Dudau | Josh Triplett | Harald Dunkel | Greg Kroah-Hartman | Marius Tolzmann | Toshi Kani | Hanjun Guo | Lee, Chun-Yi | Daniel Baluta | Shuah Khan | Dr. H. Nikolaus Schaller | Gabriele Mazzotta | Will Deacon | Vignesh Radhakrishnan | Catalin Marinas | Kamalesh Babulal | Martin KaFai Lau | David Rientjes | Krzysztof Kozlowski | Josh Poimboeuf | Sagi Grimberg | Stephen Boyd | Peter Chen | Jacek Anaszewski | Giuseppe Cantavenera | Alexander Sverdlin | tiagdtd-lava | David Ahern | David S. Miller |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 1/65 | ||||||||||||||||||||||||||||||
| 2/65 | ||||||||||||||||||||||||||||||
| 3/65 | ||||||||||||||||||||||||||||||
| 4/65 | ||||||||||||||||||||||||||||||
| 5/65 | A-b | |||||||||||||||||||||||||||||
| 6/65 | A-b | |||||||||||||||||||||||||||||
| 7/65 | ||||||||||||||||||||||||||||||
| 8/65 | ||||||||||||||||||||||||||||||
| 9/65 | ||||||||||||||||||||||||||||||
| 10/65 | ||||||||||||||||||||||||||||||
| 11/65 | ||||||||||||||||||||||||||||||
| 12/65 | R-b | |||||||||||||||||||||||||||||
| 13/65 | ||||||||||||||||||||||||||||||
| 14/65 | ||||||||||||||||||||||||||||||
| 15/65 | ||||||||||||||||||||||||||||||
| 16/65 | ||||||||||||||||||||||||||||||
| 17/65 | ||||||||||||||||||||||||||||||
| 18/65 | Reported-and-tested-by | |||||||||||||||||||||||||||||
| 19/65 | ||||||||||||||||||||||||||||||
| 20/65 | ||||||||||||||||||||||||||||||
| 21/65 | ||||||||||||||||||||||||||||||
| 22/65 | ||||||||||||||||||||||||||||||
| 23/65 | Reported-and-tested-by | A-b | R-b | R-b | ||||||||||||||||||||||||||
| 24/65 | ||||||||||||||||||||||||||||||
| 25/65 | ||||||||||||||||||||||||||||||
| 26/65 | R-b | |||||||||||||||||||||||||||||
| 27/65 | T-b | |||||||||||||||||||||||||||||
| 28/65 | A-b | |||||||||||||||||||||||||||||
| 29/65 | A-b | |||||||||||||||||||||||||||||
| 30/65 | ||||||||||||||||||||||||||||||
| 31/65 | T-b | |||||||||||||||||||||||||||||
| 32/65 | T-b | |||||||||||||||||||||||||||||
| 33/65 | T-b | |||||||||||||||||||||||||||||
| 34/65 | ||||||||||||||||||||||||||||||
| 35/65 | ||||||||||||||||||||||||||||||
| 36/65 | A-b | |||||||||||||||||||||||||||||
| 37/65 | ||||||||||||||||||||||||||||||
| 38/65 | ||||||||||||||||||||||||||||||
| 39/65 | T-b | |||||||||||||||||||||||||||||
| 40/65 | R-b | R-b | A-b | |||||||||||||||||||||||||||
| 41/65 | A-b | |||||||||||||||||||||||||||||
| 42/65 | ||||||||||||||||||||||||||||||
| 43/65 | ||||||||||||||||||||||||||||||
| 44/65 | R-b | |||||||||||||||||||||||||||||
| 45/65 | ||||||||||||||||||||||||||||||
| 46/65 | A-b | |||||||||||||||||||||||||||||
| 48/65 | ||||||||||||||||||||||||||||||
| 49/65 | ||||||||||||||||||||||||||||||
| 50/65 | ||||||||||||||||||||||||||||||
| 51/65 | ||||||||||||||||||||||||||||||
| 52/65 | R-b | |||||||||||||||||||||||||||||
| 53/65 | ||||||||||||||||||||||||||||||
| 54/65 | ||||||||||||||||||||||||||||||
| 55/65 | ||||||||||||||||||||||||||||||
| 56/65 | R-b | |||||||||||||||||||||||||||||
| 57/65 | T-b | |||||||||||||||||||||||||||||
| 58/65 | A-b | |||||||||||||||||||||||||||||
| 59/65 | T-b | A-b | ||||||||||||||||||||||||||||
| 61/65 | Reported-and-tested-by | |||||||||||||||||||||||||||||
| 62/65 | T-b | A-b | ||||||||||||||||||||||||||||
| 63/65 | ||||||||||||||||||||||||||||||
| 64/65 | A-b | |||||||||||||||||||||||||||||
| 65/65 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 30 reviewers.
Cover letter [PATCH 4.1 00/65] 4.1.3-stable review
This is the start of the stable review cycle for the 4.1.3 release. There are 65 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue Jul 21 19:07:53 UTC 2015. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.1.3-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.1.3-rc1
Frodo Lai <[email protected]>
Input: pixcir_i2c_ts - fix receive error
Zhichang Yuan <[email protected]>
of/pci: Fix pci_address_to_pio() conversion of CPU address to I/O port
Alex Williamson <[email protected]>
PCI: pciehp: Wait for hotplug command completion where necessary
Yinghai Lu <[email protected]>
PCI: Add pci_bus_addr_t
Rafael J. Wysocki <[email protected]>
PCI: Propagate the "ignore hotplug" setting to parent
Uwe Kleine-König <[email protected]>
mtd: dc21285: use raw spinlock functions for nw_gpio_lock
Brian Norris <[email protected]>
mtd: fix: avoid race condition when accessing mtd->usecount
Grygorii Strashko <[email protected]>
leds / PM: fix hibernation on arm when gpio-led used with CPU led trigger
Liu Ying <[email protected]>
video: mxsfb: Make sure axi clock is enabled when accessing registers
Axel Lin <[email protected]>
genirq: devres: Fix testing return value of request_any_context_irq()
Bart Van Assche <[email protected]>
IB/srp: Fix reconnection failure handling
Bart Van Assche <[email protected]>
IB/srp: Fix connection state tracking
Bart Van Assche <[email protected]>
IB/srp: Fix a connection setup race
Bart Van Assche <[email protected]>
IB/srp: Remove an extraneous scsi_host_put() from an error path
Bart Van Assche <[email protected]>
scsi_transport_srp: Fix a race condition
Bart Van Assche <[email protected]>
scsi_transport_srp: Introduce srp_wait_for_queuecommand()
Ezequiel Garcia <[email protected]>
spi: pl022: Specify 'num-cs' property as required in devicetree binding
Gregory CLEMENT <[email protected]>
spi: orion: Fix maximum baud rates for Armada 370/XP
Martin Sperl <[email protected]>
spi: fix race freeing dummy_tx/rx before it is unmapped
Miroslav Benes <[email protected]>
livepatch: add module locking around kallsyms calls
Stefan Wahren <[email protected]>
regulator: core: fix constraints output buffer
Joe Perches <[email protected]>
regulator: max77686: fix gpio_enabled shift wrapping bug
Maxime Coquelin <[email protected]>
regmap: Fix possible shift overflow in regmap_field_init()
Arun Chandran <[email protected]>
regmap: Fix regmap_bulk_read in BE mode
Vlastimil Babka <[email protected]>
mm, thp: respect MPOL_PREFERRED policy with non-local node
Larry Finger <[email protected]>
mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
Catalin Marinas <[email protected]>
mm: kmemleak: allow safe memory scanning during kmemleak disabling
Will Deacon <[email protected]>
arm64: vdso: work-around broken ELF toolchains in Makefile
Dave P Martin <[email protected]>
arm64: mm: Fix freeing of the wrong memmap entries with !SPARSEMEM_VMEMMAP
Mark Rutland <[email protected]>
arm64: entry: fix context tracking for el0_sp_pc
Catalin Marinas <[email protected]>
arm64: Do not attempt to use init_mm in reset_context()
Tomas Winkler <[email protected]>
mei: txe: reduce suspend/resume time
Alexander Usyskin <[email protected]>
mei: me: wait for power gating exit confirmation
Krzysztof Kozlowski <[email protected]>
power_supply: Fix possible NULL pointer dereference on early uevent
Krzysztof Kozlowski <[email protected]>
power_supply: Fix NULL pointer dereference during bq27x00_battery probe
Max Filippov <[email protected]>
arc: fix use of uninitialized arc_pmu
Vineet Gupta <[email protected]>
ARC: add compiler barrier to LLSC based cmpxchg
Vineet Gupta <[email protected]>
ARC: add smp barriers around atomics per Documentation/atomic_ops.txt
Arnaldo Carvalho de Melo <[email protected]>
tools selftests: Fix 'clean' target with make 3.81
Antonio Ospite <[email protected]>
iio: accel: kxcjk-1013: add the "KXCJ9000" ACPI id
Rafael J. Wysocki <[email protected]>
ACPI / PNP: Avoid conflicting resource reservations
Rafael J. Wysocki <[email protected]>
ACPI / PM: Add missing pm_generic_complete() invocation
Rafael J. Wysocki <[email protected]>
ACPI / init: Switch over platform to the ACPI mode later
Takashi Iwai <[email protected]>
ALSA: hda - Add a fixup for Dell E7450
Takashi Iwai <[email protected]>
ALSA: hda - Fix the dock headphone output on Fujitsu Lifebook E780
Takashi Iwai <[email protected]>
ALSA: hda - Add headset support to Acer Aspire V5
Hui Wang <[email protected]>
ALSA: hda - restore the MIC FIXUP for some Dell machines
Takashi Iwai <[email protected]>
ALSA: hda - Disable widget power-save for VIA codecs
Alex Deucher <[email protected]>
ALSA: hda - set proper caps for newer AMD hda audio in KB/KV
David Henningsson <[email protected]>
ALSA: hda - Fix Dock Headphone on Thinkpad X250 seen as a Line Out
Takashi Iwai <[email protected]>
ALSA: pcm: Fix pcm_class sysfs output
Ryan Underwood <[email protected]>
Disable write buffering on Toshiba ToPIC95
Brian King <[email protected]>
ipr: Increase default adapter init stage change timeout
Paul E. McKenney <[email protected]>
rcu: Correctly handle non-empty Tiny RCU callback list with none ready
Geert Uytterhoeven <[email protected]>
gpio: rcar: Check for irq_set_irq_wake() failures
Aaron Lu <[email protected]>
gpio: crystalcove: set IRQCHIP_SKIP_SET_WAKE for the irqchip
Eric W. Biederman <[email protected]>
mnt: Modify fs_fully_visible to deal with locked ro nodev and atime
Eric W. Biederman <[email protected]>
mnt: Refactor the logic for mounting sysfs and proc in a user namespace
Eric W. Biederman <[email protected]>
mnt: Update fs_fully_visible to test for permanently empty directories
Eric W. Biederman <[email protected]>
sysfs: Create mountpoints with sysfs_create_mount_point
Eric W. Biederman <[email protected]>
sysfs: Add support for permanently empty directories to serve as mount points.
Eric W. Biederman <[email protected]>
kernfs: Add support for always empty directories.
Eric W. Biederman <[email protected]>
proc: Allow creating permanently empty directories that serve as mount points
Eric W. Biederman <[email protected]>
sysctl: Allow creating permanently empty directories that serve as mountpoints.
Eric W. Biederman <[email protected]>
fs: Add helper functions for permanently empty directories.
-------------
Diffstat:
Documentation/DMA-API-HOWTO.txt | 29 ++-- Documentation/DMA-API.txt | 30 ++-- .../devicetree/bindings/spi/spi_pl022.txt | 2 +- Makefile | 4 +- arch/arc/include/asm/atomic.h | 21 +++ arch/arc/include/asm/bitops.h | 19 +++ arch/arc/include/asm/cmpxchg.h | 26 +++- arch/arc/include/asm/spinlock.h | 32 +++++ arch/arc/kernel/perf_event.c | 1 - arch/arm64/kernel/entry.S | 1 + arch/arm64/kernel/vdso/Makefile | 4 + arch/arm64/mm/context.c | 8 ++ arch/arm64/mm/init.c | 2 +- arch/s390/hypfs/inode.c | 12 +- drivers/acpi/bus.c | 56 ++++++-- drivers/acpi/device_pm.c | 1 + drivers/acpi/osl.c | 6 +- drivers/acpi/resource.c | 160 +++++++++++++++++++++ drivers/base/regmap/regmap.c | 5 +- drivers/firmware/efi/efi.c | 6 +- drivers/gpio/gpio-crystalcove.c | 1 + drivers/gpio/gpio-rcar.c | 13 +- drivers/iio/accel/kxcjk-1013.c | 1 + drivers/infiniband/ulp/srp/ib_srp.c | 83 +++++------ drivers/infiniband/ulp/srp/ib_srp.h | 2 +- drivers/input/touchscreen/pixcir_i2c_ts.c | 2 +- drivers/leds/led-class.c | 7 +- drivers/misc/mei/client.c | 2 +- drivers/misc/mei/hw-me.c | 59 +++++++- drivers/misc/mei/hw-txe.c | 33 +++-- drivers/misc/mei/mei_dev.h | 11 ++ drivers/mtd/maps/dc21285.c | 4 +- drivers/mtd/mtd_blkdevs.c | 5 + drivers/of/address.c | 2 +- drivers/pci/Kconfig | 4 + drivers/pci/bus.c | 10 +- drivers/pci/hotplug/pciehp_hpc.c | 52 +++++-- drivers/pci/pci.c | 11 ++ drivers/pci/probe.c | 12 +- drivers/pcmcia/topic.h | 16 +++ drivers/pnp/system.c | 35 +++-- drivers/power/power_supply_core.c | 61 +++++++- drivers/regulator/core.c | 2 +- drivers/regulator/max77686.c | 6 +- drivers/scsi/ipr.h | 2 +- drivers/scsi/scsi_transport_srp.c | 58 ++++---- drivers/spi/spi-orion.c | 25 +++- drivers/spi/spi.c | 11 +- drivers/video/fbdev/mxsfb.c | 68 +++++++-- fs/configfs/mount.c | 10 +- fs/debugfs/inode.c | 11 +- fs/fuse/inode.c | 9 +- fs/kernfs/dir.c | 38 ++++- fs/kernfs/inode.c | 2 + fs/libfs.c | 96 +++++++++++++ fs/namespace.c | 31 +++- fs/proc/generic.c | 23 +++ fs/proc/inode.c | 4 + fs/proc/internal.h | 6 + fs/proc/proc_sysctl.c | 37 +++++ fs/proc/root.c | 9 +- fs/pstore/inode.c | 12 +- fs/sysfs/dir.c | 34 +++++ fs/sysfs/mount.c | 5 +- fs/tracefs/inode.c | 6 +- include/linux/acpi.h | 12 ++ include/linux/fs.h | 4 +- include/linux/kernfs.h | 3 + include/linux/kmemleak.h | 6 +- include/linux/pci.h | 18 +-- include/linux/power_supply.h | 1 + include/linux/sysctl.h | 3 + include/linux/sysfs.h | 15 ++ include/linux/types.h | 12 +- init/main.c | 1 + kernel/cgroup.c | 10 +- kernel/irq/devres.c | 4 +- kernel/livepatch/core.c | 18 ++- kernel/rcu/tiny.c | 5 + kernel/sysctl.c | 8 +- mm/kmemleak.c | 28 +++- mm/mempolicy.c | 38 ++--- mm/percpu.c | 2 +- security/inode.c | 10 +- security/selinux/selinuxfs.c | 11 +- security/smack/smackfs.c | 8 +- sound/core/pcm.c | 6 +- sound/pci/hda/hda_intel.c | 4 + sound/pci/hda/patch_realtek.c | 44 +++++- sound/pci/hda/patch_via.c | 8 +- tools/testing/selftests/Makefile | 2 +- 91 files changed, 1278 insertions(+), 359 deletions(-)