Skip to content

3.2.10-stable review

Greg KH lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest95 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/95ARM: OMAP: make iommu subsys_initcall to fix builtin omap3isparch/arm/mach-omap2/mailbox.c drivers/iommu/omap-iommu.c+4 -22 replies
2/95autofs: work around unhappy compat problem on x86-64fs/autofs4/autofs_i.h fs/autofs4/dev-ioctl.c fs/autofs4/inode.c +1 more+23 -30 replies
3/95Fix autofs compile without CONFIG_COMPATinclude/linux/compat.h+4 -00 replies
4/95compat: fix compile breakage on s390arch/s390/include/asm/compat.h arch/s390/kernel/process.c arch/s390/kernel/ptrace.c +10 more+9 -140 replies
5/95drm/i915: Prevent a machine hang by checking crtc->active before loading lutdrivers/gpu/drm/i915/intel_display.c+1 -10 replies
6/95ARM: LPC32xx: serial.c: HW bug workaroundarch/arm/mach-lpc32xx/serial.c+18 -00 replies
7/95ARM: LPC32xx: serial.c: Fixed loop limitarch/arm/mach-lpc32xx/serial.c+1 -10 replies
8/95ARM: LPC32xx: irq.c: Clear latched eventarch/arm/mach-lpc32xx/irq.c+10 -10 replies
9/95ARM: LPC32xx: Fix interrupt controller initarch/arm/mach-lpc32xx/irq.c+6 -40 replies
10/95ARM: LPC32xx: Fix irq on GPI_28arch/arm/mach-lpc32xx/include/mach/irqs.h arch/arm/mach-lpc32xx/irq.c+5 -10 replies
11/95watchdog: hpwdt: clean up set_memory_x call for 32 bitdrivers/watchdog/hpwdt.c+3 -20 replies
12/95i2c: mxs: only flag completion when queue is completely donedrivers/i2c/busses/i2c-mxs.c+10 -30 replies
13/95regulator: fix the ldo configure according to 88pm860x specdrivers/regulator/88pm8607.c+3 -30 replies
14/95S390: KEYS: Enable the compat keyctl wrapper on s390xarch/s390/Kconfig+3 -00 replies
15/95perf/x86/kvm: Fix Host-Only/Guest-Only counting with SVM disabledarch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event.h arch/x86/kernel/cpu/perf_event_amd.c +1 more+54 -40 replies
16/95ALSA: hda/realtek - Fix resume of multiple input sourcessound/pci/hda/patch_realtek.c+1 -10 replies
17/95ALSA: hda - Add a fake mute featuresound/pci/hda/hda_codec.c sound/pci/hda/hda_codec.h sound/pci/hda/patch_conexant.c+30 -30 replies
18/95ALSA: hda - Always set HP pin in unsol handler for STAC/IDT codecssound/pci/hda/patch_sigmatel.c+1 -10 replies
19/95regset: Prevent null pointer reference on readonly regsetsfs/binfmt_elf.c include/linux/regset.h+7 -10 replies
20/95regset: Return -EFAULT, not -EIO, on host-side memory faultinclude/linux/regset.h+2 -20 replies
21/95mfd: Fix ACPI conflict checkdrivers/mfd/mfd-core.c+1 -10 replies
22/95mfd: Test for jack detection when deciding if wm8994 should suspenddrivers/mfd/wm8994-core.c+14 -00 replies
23/95genirq: Clear action->thread_mask if IRQ_ONESHOT is not setkernel/irq/manage.c+38 -60 replies
24/95ARM: S3C24XX: DMA resume regression fixarch/arm/plat-s3c24xx/dma.c+1 -10 replies
25/95Move Logitech Harmony 900 from cdc_ether to zaurusdrivers/net/usb/cdc_ether.c drivers/net/usb/zaurus.c+14 -00 replies
26/95alpha: fix 32/64-bit bug in futex supportarch/alpha/include/asm/futex.h+1 -10 replies
27/95mmc: atmel-mci: dont use dma features when using DMA with no chan availabledrivers/mmc/host/atmel-mci.c+10 -110 replies
28/95mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5drivers/mmc/host/sdhci-esdhc-imx.c+3 -20 replies
29/95aio: wake up waiters when freeing unused kiocbsfs/aio.c+2 -00 replies
30/95mm: memcg: Correct unregistring of events attached to the same eventfdmm/memcontrol.c+4 -10 replies
31/95NOMMU: Dont need to clear vm_mm when deleting a VMAmm/nommu.c+0 -20 replies
32/95cifs: fix dentry refcount leak when opening a FIFO on lookupfs/cifs/dir.c+18 -20 replies
33/95mac80211: zero initialize count field in ieee80211_tx_ratenet/mac80211/rate.c+1 -10 replies
34/95ath9k_hw: prevent writes to const data on AR9160drivers/net/wireless/ath/ath9k/ar5008_phy.c drivers/net/wireless/ath/ath9k/ar9002_hw.c drivers/net/wireless/ath/ath9k/hw.h+20 -250 replies
35/95kprobes: return proper error code from register_kprobe()kernel/kprobes.c+7 -50 replies
36/95mm: thp: fix BUG on mm->nr_ptesmm/huge_memory.c+3 -30 replies
37/95iwlwifi: fix key removaldrivers/net/wireless/iwlwifi/iwl-agn-sta.c+9 -10 replies
38/95tty/powerpc: early udbg consoles cant be modulesdrivers/tty/Kconfig+1 -10 replies
39/95S390: qdio: fix handler function arguments for zfcp data routerdrivers/s390/cio/qdio_main.c+2 -20 replies
40/95rapidio/tsi721: fix queue wrapping bug in inbound doorbell handlerdrivers/rapidio/devices/tsi721.c+3 -20 replies
41/95HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboarddrivers/hid/hid-ids.h drivers/hid/usbhid/hid-quirks.c+4 -00 replies
42/95crypto: mv_cesa - fix final callback not ignoring input datadrivers/crypto/mv_cesa.c+1 -00 replies
43/95osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576drivers/scsi/osd/osd_uld.c+2 -20 replies
44/95viafb: select HW scaling on VX900 for IGA2drivers/video/via/hw.c+1 -00 replies
45/95viafb: fix IGA1 modesetting on VX900drivers/video/via/hw.c+3 -00 replies
46/95ASoC: dapm: Check for bias level when powering downsound/soc/soc-dapm.c+9 -30 replies
47/95ASoC: i.MX SSI: Fix DSP_A format.sound/soc/imx/imx-ssi.c+1 -10 replies
48/95bsg: fix sysfs link remove warningblock/bsg.c+2 -10 replies
49/95avr32: select generic atomic64_t supportarch/avr32/Kconfig+1 -00 replies
50/95ACPI / PM: Do not save/restore NVS on Asus K54C/K54HRdrivers/acpi/sleep.c+16 -00 replies
51/95rtl8192cu: Add new device IDsdrivers/net/wireless/rtlwifi/rtl8192cu/sw.c+32 -40 replies
52/95drm/i915: gen7: implement rczunit workarounddrivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c+6 -00 replies
53/95drm/i915: gen7: Implement an L3 caching workaround.drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c+13 -00 replies
54/95drm/i915: gen7: work around a system hang on IVBdrivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c+9 -00 replies
55/95drm/i915: gen7: Disable the RHWO optimization as it can cause GPU hangs.drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_display.c+7 -00 replies
56/95drm/i915: fix ELD writing for SandyBridgedrivers/gpu/drm/i915/intel_display.c+5 -50 replies
57/95ARM: orion: Fix USB phy for orion5x.arch/arm/mach-dove/common.c arch/arm/mach-kirkwood/common.c arch/arm/mach-mv78xx0/common.c +3 more+15 -100 replies
58/95ARM: orion: Fix Orion5x GPIO regression from MPP cleanuparch/arm/mach-kirkwood/mpp.h arch/arm/mach-mv78xx0/mpp.h arch/arm/plat-orion/mpp.c+274 -2750 replies
59/95OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpiosarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c+2 -40 replies
60/95OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPDarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c+4 -40 replies
61/95OMAPDSS: remove wrong HDMI HPD muxingarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c+0 -80 replies
62/95OMAP: 4430SDP/Panda: setup HDMI GPIO muxesarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c+6 -00 replies
63/95OMAP: 4430SDP/Panda: add HDMI HPD gpioarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c+6 -00 replies
64/95OMAPDSS: HDMI: PHY burnout fixarch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c drivers/video/omap2/dss/hdmi.c +3 more+86 -40 replies
65/95OMAPDSS: HDMI: hot plug detect fixdrivers/video/omap2/dss/ti_hdmi_4xxx_ip.c+1 -80 replies
66/95ARM: 7345/1: errata: update workaround for A9 erratum #743622arch/arm/Kconfig arch/arm/mm/proc-v7.S+2 -40 replies
67/95ARM: 7354/1: perf: limit sample_period to half max_period in non-sampling modearch/arm/include/asm/pmu.h arch/arm/kernel/perf_event.c arch/arm/kernel/perf_event_v6.c +2 more+16 -160 replies
68/95ARM: 7355/1: perf: clear overflow flag when disabling counter on ARMv7 PMUarch/arm/kernel/perf_event_v7.c+5 -00 replies
69/95ARM: 7356/1: perf: check that we have an event in the PMU IRQ handlersarch/arm/kernel/perf_event_v6.c arch/arm/kernel/perf_event_v7.c arch/arm/kernel/perf_event_xscale.c+12 -180 replies
70/95ARM: 7357/1: perf: fix overflow handling for xscale2 PMUsarch/arm/kernel/perf_event_xscale.c+8 -20 replies
71/95media: staging: lirc_serial: Fix init/exit orderdrivers/staging/media/lirc/lirc_serial.c+21 -350 replies
72/95media: staging: lirc_serial: Free resources on failure paths of lirc_serial_probe()drivers/staging/media/lirc/lirc_serial.c+16 -30 replies
73/95media: staging: lirc_serial: Fix deadlock on resume failuredrivers/staging/media/lirc/lirc_serial.c+1 -30 replies
74/95media: staging: lirc_serial: Do not assume error codes returned by request_irq()drivers/staging/media/lirc/lirc_serial.c+9 -120 replies
75/95Input: ALPS - fix touchpad detection when buttons are presseddrivers/input/mouse/alps.c+5 -20 replies
76/95hwmon: (pmbus_core) Fix maximum number of POUT alarm attributesdrivers/hwmon/pmbus/pmbus_core.c+2 -10 replies
77/95hwmon: (jc42) Add support for ST Microelectronics STTS2002 and STTS3000Documentation/hwmon/jc42 drivers/hwmon/Kconfig drivers/hwmon/jc42.c+18 -10 replies
78/95hwmon: (jc42) Add support for AT30TS00, TS3000GB2, TSE2002GB2, and MCP9804Documentation/hwmon/jc42 drivers/hwmon/Kconfig drivers/hwmon/jc42.c+35 -110 replies
79/95hwmon: (zl6100) Maintain delay parameter in driver instance datadrivers/hwmon/pmbus/zl6100.c+6 -40 replies
80/95carl9170: Fix memory accounting when sta is in power-save mode.drivers/net/wireless/ath/carl9170/tx.c+1 -00 replies
81/95carl9170: fix frame delivery if sta is in powersave modedrivers/net/wireless/ath/carl9170/tx.c+5 -30 replies
82/95drm/radeon/kms: set SX_MISC in the r6xx blit code (v2)drivers/gpu/drm/radeon/r600_blit_shaders.c+8 -00 replies
83/95net/usbnet: avoid recursive locking in usbnet_stop()drivers/net/usb/usbnet.c+2 -00 replies
84/95x86/amd: iommu_set_device_table() must not be __initdrivers/iommu/amd_iommu_init.c+1 -10 replies
85/95dm ioctl: do not leak argv if target message only contains whitespacedrivers/md/dm-ioctl.c+1 -10 replies
86/95dm io: fix discard supportdrivers/md/dm-io.c+16 -70 replies
87/95dm flakey: fix crash on read when corrupt_bio_byte not setdrivers/md/dm-flakey.c+1 -10 replies
88/95dm thin metadata: remove incorrect close_device on creation error pathsdrivers/md/dm-thin-metadata.c+17 -50 replies
89/95dm thin metadata: unlock superblock in init_pmd error pathdrivers/md/dm-thin-metadata.c+1 -00 replies
90/95dm thin metadata: decrement counter after removing mapped blockdrivers/md/dm-thin-metadata.c+2 -00 replies
91/95dm raid: set MD_CHANGE_DEVS when rebuildingdrivers/md/dm-raid.c+10 -60 replies
92/95dm raid: fix flush supportdrivers/md/dm-raid.c+1 -00 replies
93/95cs5535-mfgpt: dont call __init function from __devinitdrivers/misc/cs5535-mfgpt.c+1 -10 replies
94/95mfd: Fix cs5535 section mismatchdrivers/mfd/cs5535-mfd.c+3 -30 replies
95/95spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driverdrivers/spi/spi-topcliff-pch.c+3 -30 replies

Reviews trailers per patch

33 of 95 patches have a Reviewed-by or Acked-by.

PatchLaurent PinchartThomas MeyerAndreas SchwabJesse Barnes[email protected]Christian BorntraegerJulian SikorskiOleg NesterovRoland McGrathSven JoachimStefan Lippers-HollmannHeiko StuebnerMichael CreePhil CarmodyMatt TurnerShawn GuoBart Van AsscheKAMEZAWA HiroyukiAl ViroCAI QianShirish PargaonkarMasami HiramatsuHugh DickinsAlexander SchnaidtJan GlauberSascha HauerHans-Christian EgtvedtEugeni DodonovKenneth GraunkeAmbroz BizjakNicolas PitreTony LindgrenSeth ForsheeJean DelvareChristian LamparterAlex DeucherOliver NeukumMike SnitzerAndres Salomon
1/95Debugged-by
2/95Reported-and-tested-by
3/95Reported-and-tested-by
4/95
5/95R-b
6/95
7/95
8/95
9/95
10/95
11/95
12/95
13/95
14/95A-b R-b
15/95
16/95Reported-and-tested-by
17/95
18/95
19/95R-b A-b
20/95R-b A-b
21/95
22/95
23/95Reported-and-tested-by Reported-and-tested-by
24/95R-b
25/95
26/95T-b A-b R-b
27/95
28/95A-b
29/95T-b
30/95A-b
31/95A-b
32/95T-b R-b
33/95
34/95
35/95A-b
36/95A-b
37/95T-b
38/95
39/95R-b
40/95
41/95
42/95
43/95
44/95
45/95
46/95
47/95A-b
48/95
49/95A-b
50/95
51/95
52/95T-b
53/95T-b
54/95T-b R-b
55/95T-b
56/95
57/95T-b A-b
58/95A-b
59/95A-b
60/95A-b
61/95A-b
62/95A-b
63/95A-b
64/95
65/95
66/95
67/95
68/95
69/95
70/95
71/95
72/95
73/95
74/95
75/95T-b
76/95
77/95
78/95A-b
79/95A-b
80/95A-b
81/95
82/95R-b
83/95A-b
84/95
85/95
86/95A-b
87/95
88/95
89/95A-b
90/95A-b
91/95
92/95A-b
93/95
94/95A-b
95/95

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 39 reviewers.

Read the v1 thread

Cover letter [ 00/95] 3.2.10-stable review

This is the start of the stable review cycle for the 3.2.10 release. There are 95 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 Sun Mar 11 19:00:00 UTC 2012. 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/v3.0/stable-review/patch-3.2.10-rc1.gz

and the diffstat can be found below.

thanks,

greg k-h

-------------

 Documentation/hwmon/jc42                    |   26 ++-
 Makefile                                    |    4 +-
 arch/alpha/include/asm/futex.h              |    2 +-
 arch/arm/Kconfig                            |    2 +-
 arch/arm/include/asm/pmu.h                  |    2 +-
 arch/arm/kernel/perf_event.c                |   22 +-
 arch/arm/kernel/perf_event_v6.c             |   22 +--
 arch/arm/kernel/perf_event_v7.c             |   11 +-
 arch/arm/kernel/perf_event_xscale.c         |   20 ++-
 arch/arm/mach-dove/common.c                 |    3 +-
 arch/arm/mach-kirkwood/common.c             |    3 +-
 arch/arm/mach-kirkwood/mpp.h                |  320 +++++++++++++-------------
 arch/arm/mach-lpc32xx/include/mach/irqs.h   |    2 +-
 arch/arm/mach-lpc32xx/irq.c                 |   25 ++-
 arch/arm/mach-lpc32xx/serial.c              |   20 ++-
 arch/arm/mach-mv78xx0/common.c              |    3 +-
 arch/arm/mach-mv78xx0/mpp.h                 |  226 ++++++++++----------
 arch/arm/mach-omap2/board-4430sdp.c         |   22 ++-
 arch/arm/mach-omap2/board-omap4panda.c      |   22 ++-
 arch/arm/mach-omap2/mailbox.c               |    3 +-
 arch/arm/mach-orion5x/common.c              |    4 +-
 arch/arm/mm/proc-v7.S                       |    4 +-
 arch/arm/plat-orion/common.c                |    9 +-
 arch/arm/plat-orion/include/plat/common.h   |    3 +-
 arch/arm/plat-orion/mpp.c                   |    3 +-
 arch/arm/plat-s3c24xx/dma.c                 |    2 +-
 arch/avr32/Kconfig                          |    1 +
 arch/s390/Kconfig                           |    3 +
 arch/s390/include/asm/compat.h              |    7 -
 arch/s390/kernel/process.c                  |    1 -
 arch/s390/kernel/ptrace.c                   |    2 +-
 arch/s390/kernel/setup.c                    |    2 +-
 arch/s390/kernel/signal.c                   |    1 -
 arch/s390/mm/fault.c                        |    1 -
 arch/s390/mm/mmap.c                         |    2 +-
 arch/x86/include/asm/perf_event.h           |    8 +
 arch/x86/kernel/cpu/perf_event.h            |    8 +-
 arch/x86/kernel/cpu/perf_event_amd.c        |   37 +++-
 arch/x86/kvm/svm.c                          |    5 +
 block/bsg.c                                 |    3 +-
 drivers/acpi/sleep.c                        |   16 ++
 drivers/crypto/mv_cesa.c                    |    1 +
 drivers/gpu/drm/i915/i915_reg.h             |   15 ++
 drivers/gpu/drm/i915/intel_display.c        |   32 +++-
 drivers/gpu/drm/radeon/r600_blit_shaders.c  |    8 +
 drivers/hid/hid-ids.h                       |    3 +
 drivers/hid/usbhid/hid-quirks.c             |    1 +
 drivers/hwmon/Kconfig                       |    5 +-
 drivers/hwmon/jc42.c                        |   30 +++-
 drivers/hwmon/pmbus/pmbus_core.c            |    3 +-
 drivers/hwmon/pmbus/zl6100.c                |   10 +-
 drivers/i2c/busses/i2c-mxs.c                |   13 +-
 drivers/input/mouse/alps.c                  |    7 +-
 drivers/iommu/amd_iommu_init.c              |    2 +-
 drivers/iommu/omap-iommu.c                  |    3 +-
 drivers/md/dm-flakey.c                      |    2 +-
 drivers/md/dm-io.c                          |   23 ++-
 drivers/md/dm-ioctl.c                       |    2 +-
 drivers/md/dm-raid.c                        |   17 +-
 drivers/md/dm-thin-metadata.c               |   25 ++-
 drivers/mfd/cs5535-mfd.c                    |    6 +-
 drivers/mfd/mfd-core.c                      |    2 +-
 drivers/mfd/wm8994-core.c                   |   14 ++
 drivers/misc/cs5535-mfgpt.c                 |    2 +-
 drivers/mmc/host/atmel-mci.c                |   21 +-
 drivers/mmc/host/sdhci-esdhc-imx.c          |    5 +-
 drivers/net/usb/cdc_ether.c                 |    7 +
 drivers/net/usb/usbnet.c                    |    2 +
 drivers/net/usb/zaurus.c                    |    7 +
 drivers/net/wireless/ath/ath9k/ar5008_phy.c |   25 +--
 drivers/net/wireless/ath/ath9k/ar9002_hw.c  |   19 ++
 drivers/net/wireless/ath/ath9k/hw.h         |    1 -
 drivers/net/wireless/ath/carl9170/tx.c      |    9 +-
 drivers/net/wireless/iwlwifi/iwl-agn-sta.c  |   10 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c |   36 +++-
 drivers/rapidio/devices/tsi721.c            |    5 +-
 drivers/regulator/88pm8607.c                |    6 +-
 drivers/s390/block/dasd_eckd.c              |    2 +-
 drivers/s390/block/dasd_ioctl.c             |    1 +
 drivers/s390/char/fs3270.c                  |    1 +
 drivers/s390/char/vmcp.c                    |    1 +
 drivers/s390/cio/chsc_sch.c                 |    1 +
 drivers/s390/cio/qdio_main.c                |    4 +-
 drivers/s390/scsi/zfcp_cfdc.c               |    1 +
 drivers/scsi/osd/osd_uld.c                  |    4 +-
 drivers/spi/spi-topcliff-pch.c              |    6 +-
 drivers/staging/media/lirc/lirc_serial.c    |  100 ++++-----
 drivers/tty/Kconfig                         |    2 +-
 drivers/video/omap2/dss/hdmi.c              |    3 +
 drivers/video/omap2/dss/ti_hdmi.h           |    4 +
 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c   |   77 ++++++-
 drivers/video/via/hw.c                      |    4 +
 drivers/watchdog/hpwdt.c                    |    5 +-
 fs/aio.c                                    |    2 +
 fs/autofs4/autofs_i.h                       |    1 +
 fs/autofs4/dev-ioctl.c                      |    1 +
 fs/autofs4/inode.c                          |    2 +
 fs/autofs4/waitq.c                          |   22 ++-
 fs/binfmt_elf.c                             |    2 +-
 fs/cifs/dir.c                               |   20 ++-
 include/linux/compat.h                      |    4 +
 include/linux/regset.h                      |   10 +-
 include/video/omapdss.h                     |    5 +
 kernel/irq/manage.c                         |   44 ++++-
 kernel/kprobes.c                            |   12 +-
 mm/huge_memory.c                            |    6 +-
 mm/memcontrol.c                             |    5 +-
 mm/nommu.c                                  |    2 -
 net/mac80211/rate.c                         |    2 +-
 sound/pci/hda/hda_codec.c                   |    8 +-
 sound/pci/hda/hda_codec.h                   |    3 +
 sound/pci/hda/patch_conexant.c              |   22 ++-
 sound/pci/hda/patch_realtek.c               |    2 +-
 sound/pci/hda/patch_sigmatel.c              |    2 +-
 sound/soc/imx/imx-ssi.c                     |    2 +-
 sound/soc/soc-dapm.c                        |   12 +-
 116 files changed, 1082 insertions(+), 586 deletions(-)