4.9.83-stable review
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest77 patches 14 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/77 | scsi: smartpqi: allow static build ("built-in")drivers/ | +1 | 0 replies | |
| 2/77 | drm/radeon: Add dpm quirk for Jet PRO (v2)drivers/ | +5 | 0 replies | |
| 3/77 | drm/radeon: adjust tested variabledrivers/ | +1 | 0 replies | |
| 4/77 | rtc-opal: Fix handling of firmware error codes, prevent busy loopsdrivers/ | +10 | 0 replies | |
| 5/77 | mbcache: initialize entry->e_referenced in mb_cache_entry_create()fs/ | +1 | 0 replies | |
| 6/77 | jbd2: fix sphinx kernel-doc build warningsfs/ include/ | +272 | 0 replies | |
| 7/77 | ext4: fix a race in the ext4 shutdown pathfs/ | +12 | 0 replies | |
| 8/77 | ext4: save error to disk in __ext4_grp_locked_error()fs/ | +1 | 0 replies | |
| 9/77 | ext4: correct documentation for grpid mount optionDocumentation/ | +1 | 0 replies | |
| 10/77 | mm: hide a #warning for COMPILE_TESTmm/ | +1 | 0 replies | |
| 11/77 | mm: Fix memory size alignment in devm_memremap_pages_release()kernel/ | +2 | 0 replies | |
| 12/77 | MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIANarch/ | +6 | 0 replies | |
| 13/77 | PCI: keystone: Fix interrupt-controller-node lookupdrivers/ | +4 | 0 replies | |
| 14/77 | video: fbdev: atmel_lcdfb: fix display-timings lookupdrivers/ | +7 | 0 replies | |
| 15/77 | console/dummy: leave .con_font_get set to NULLdrivers/ | +0 | 0 replies | |
| 16/77 | rtlwifi: rtl8821ae: Fix connection lost problem correctlydrivers/ drivers/ | +4 | 0 replies | |
| 17/77 | target/iscsi: avoid NULL dereference in CHAP auth error pathdrivers/ | +2 | 0 replies | |
| 18/77 | Btrfs: fix deadlock in run_delalloc_nocowfs/ | +4 | 0 replies | |
| 19/77 | Btrfs: fix crash due to not cleaning up tree log blocks dirty bitsfs/ | +9 | 0 replies | |
| 20/77 | Btrfs: fix extent state leak from tree logfs/ | +3 | 0 replies | |
| 21/77 | Btrfs: fix btrfs_evict_inode to handle abnormal inodes correctlyfs/ | +1 | 0 replies | |
| 22/77 | Btrfs: fix unexpected -EEXIST when creating new inodefs/ | +18 | 0 replies | |
| 23/77 | 9p/trans_virtio: discard zero-length replynet/ | +2 | 0 replies | |
| 24/77 | mtd: nand: vf610: set correct ooblayoutdrivers/ | +2 | 0 replies | |
| 25/77 | ALSA: hda - Fix headset mic detection problem for two Dell machinessound/ | +9 | 0 replies | |
| 26/77 | ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attributesound/ | +11 | 0 replies | |
| 27/77 | ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platformsound/ | +42 | 0 replies | |
| 28/77 | ALSA: hda/realtek: PCI quirk for Fujitsu U7x7sound/ | +19 | 0 replies | |
| 29/77 | ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204sound/ | +9 | 0 replies | |
| 30/77 | ALSA: seq: Fix racy pool initializationssound/ | +6 | 0 replies | |
| 31/77 | mvpp2: fix multicast address filterdrivers/ | +8 | 0 replies | |
| 32/77 | usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORTdrivers/ drivers/ | +8 | 0 replies | |
| 33/77 | dm: correctly handle chained bios in dec_pending()drivers/ | +2 | 0 replies | |
| 34/77 | powerpc: fix build errors in stable treearch/ | +5 | 19 replies | |
| 35/77 | IB/qib: Fix comparison error with qperf compare/swap testdrivers/ | +3 | 0 replies | |
| 36/77 | IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH portsdrivers/ drivers/ | +8 | 0 replies | |
| 37/77 | kselftest: fix OOM in memory compaction testtools/ | +2 | 0 replies | |
| 38/77 | RDMA/rxe: Fix a race condition related to the QP error statedrivers/ | +2 | 0 replies | |
| 39/77 | cpufreq: powernv: Dont assume distinct pstate values for nominal and pmindrivers/ | +2 | 0 replies | |
| 40/77 | PM / devfreq: Propagate error from devfreq_add_device()drivers/ | +1 | 0 replies | |
| 41/77 | ocfs2: try a blocking lock before return AOP_TRUNCATED_PAGEfs/ | +9 | 0 replies | |
| 42/77 | s390: fix handling of -1 in set{,fs}[gu]id16 syscallsarch/ | +4 | 0 replies | |
| 43/77 | arm64: dts: msm8916: Correct ipc references for smsmarch/ | +2 | 0 replies | |
| 44/77 | ARM: lpc3250: fix uda1380 gpio numbersarch/ arch/ | +4 | 0 replies | |
| 45/77 | ARM: dts: STi: Add gpio polarity for "hdmi,hpd-gpio" propertyarch/ arch/ | +4 | 0 replies | |
| 46/77 | ARM: dts: nomadik: add interrupt-parent for clcdarch/ | +1 | 0 replies | |
| 47/77 | arm: spear600: Add missing interrupt-parent of rtcarch/ | +1 | 0 replies | |
| 48/77 | arm: spear13xx: Fix dmas cellsDocumentation/ arch/ arch/ | +6 | 0 replies | |
| 49/77 | arm: spear13xx: Fix spics gpio controllers warningarch/ | +1 | 0 replies | |
| 50/77 | x86/entry/64/compat: Clear registers for compat syscalls, to reduce speculation attack surfacearch/ | +30 | 0 replies | |
| 51/77 | compiler-gcc.h: Introduce __optimize function attributeinclude/ include/ | +8 | 0 replies | |
| 52/77 | x86/speculation: Update Speculation Control microcode blacklistarch/ | +0 | 0 replies | |
| 53/77 | x86/speculation: Correct Speculation Control microcode blacklist againarch/ | +6 | 0 replies | |
| 54/77 | KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methodsarch/ | +5 | 0 replies | |
| 55/77 | X86/nVMX: Properly set spec_ctrl and pred_cmd before merging MSRsarch/ | +2 | 0 replies | |
| 56/77 | x86/speculation: Clean up various Spectre related detailsarch/ | +11 | 0 replies | |
| 57/77 | selftests/x86/pkeys: Remove unused functionstools/ | +0 | 0 replies | |
| 58/77 | selftests/x86: Do not rely on "int $0x80" in test_mremap_vdso.ctools/ | +4 | 0 replies | |
| 59/77 | selftests/x86: Do not rely on "int $0x80" in single_step_syscall.ctools/ tools/ | +6 | 0 replies | |
| 60/77 | x86/speculation: Fix up array_index_nospec_mask() asm constraintarch/ | +1 | 0 replies | |
| 61/77 | nospec: Move array_index_nospec() parameter checking into separate macroinclude/ | +21 | 0 replies | |
| 62/77 | x86/speculation: Add <asm/msr-index.h> dependencyarch/ | +1 | 0 replies | |
| 63/77 | selftests/x86/mpx: Fix incorrect bounds with old _sigfaulttools/ | +30 | 0 replies | |
| 64/77 | x86/cpu: Rename cpu_data.x86_mask to cpu_data.x86_steppingarch/ arch/ arch/ +31 more | +69 | 0 replies | |
| 65/77 | x86/spectre: Fix an error messagearch/ | +1 | 0 replies | |
| 66/77 | x86/cpu: Change type of x86_cache_size variable to unsigned intarch/ arch/ arch/ +1 more | +5 | 0 replies | |
| 67/77 | x86: fix build warnign with 32-bit PAEinclude/ | +1 | 0 replies | |
| 68/77 | vfs: dont do RCU lookup of empty pathnamesfs/ | +3 | 0 replies | |
| 69/77 | ARM: dts: exynos: fix RTC interrupt for exynos5410arch/ | +0 | 0 replies | |
| 70/77 | ARM: pxa/tosa-bt: add MODULE_LICENSE tagarch/ | +4 | 0 replies | |
| 71/77 | arm64: dts: msm8916: Add missing #phy-cellsarch/ | +1 | 0 replies | |
| 72/77 | ARM: dts: s5pv210: add interrupt-parent for ohciarch/ | +1 | 0 replies | |
| 73/77 | arm: dts: mt2701: Add reset-cellsarch/ | +2 | 0 replies | |
| 74/77 | ARM: dts: Delete bogus reference to the charlcdarch/ | +0 | 0 replies | |
| 75/77 | media: r820t: fix r820t_write_reg for KASANdrivers/ | +8 | 0 replies | |
| 76/77 | mmc: sdhci-of-esdhc: fix eMMC couldnt work after kexecdrivers/ | +4 | 0 replies | |
| 77/77 | mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardbdrivers/ | +8 | 2 replies |
Reviews trailers per patch
28 of 77 patches have a Reviewed-by or Acked-by.
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 32 reviewers.
Cover letter [PATCH 4.9 00/77] 4.9.83-stable review
This is the start of the stable review cycle for the 4.9.83 release. There are 77 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 Fri Feb 23 12:44:14 UTC 2018. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.83-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.83-rc1
yinbo.zhu <[email protected]>
mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardb
yinbo.zhu <[email protected]>
mmc: sdhci-of-esdhc: fix eMMC couldn't work after kexec
Arnd Bergmann <[email protected]>
media: r820t: fix r820t_write_reg for KASAN
Linus Walleij <[email protected]>
ARM: dts: Delete bogus reference to the charlcd
Matthias Brugger <[email protected]>
arm: dts: mt2701: Add reset-cells
Arnd Bergmann <[email protected]>
ARM: dts: s5pv210: add interrupt-parent for ohci
Bjorn Andersson <[email protected]>
arm64: dts: msm8916: Add missing #phy-cells
Arnd Bergmann <[email protected]>
ARM: pxa/tosa-bt: add MODULE_LICENSE tag
Arnd Bergmann <[email protected]>
ARM: dts: exynos: fix RTC interrupt for exynos5410
Linus Torvalds <[email protected]>
vfs: don't do RCU lookup of empty pathnames
Arnd Bergmann <[email protected]>
x86: fix build warnign with 32-bit PAE
Gustavo A. R. Silva <[email protected]>
x86/cpu: Change type of x86_cache_size variable to unsigned int
Dan Carpenter <[email protected]>
x86/spectre: Fix an error message
Jia Zhang <[email protected]>
x86/cpu: Rename cpu_data.x86_mask to cpu_data.x86_stepping
Rui Wang <[email protected]>
selftests/x86/mpx: Fix incorrect bounds with old _sigfault
Peter Zijlstra <[email protected]>
x86/speculation: Add <asm/msr-index.h> dependency
Will Deacon <[email protected]>
nospec: Move array_index_nospec() parameter checking into separate macro
Dan Williams <[email protected]>
x86/speculation: Fix up array_index_nospec_mask() asm constraint
Dominik Brodowski <[email protected]>
selftests/x86: Do not rely on "int $0x80" in single_step_syscall.c
Dominik Brodowski <[email protected]>
selftests/x86: Do not rely on "int $0x80" in test_mremap_vdso.c
Ingo Molnar <[email protected]>
selftests/x86/pkeys: Remove unused functions
Ingo Molnar <[email protected]>
x86/speculation: Clean up various Spectre related details
KarimAllah Ahmed <[email protected]>
X86/nVMX: Properly set spec_ctrl and pred_cmd before merging MSRs
David Woodhouse <[email protected]>
KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methods
David Woodhouse <[email protected]>
x86/speculation: Correct Speculation Control microcode blacklist again
David Woodhouse <[email protected]>
x86/speculation: Update Speculation Control microcode blacklist
Geert Uytterhoeven <[email protected]>
compiler-gcc.h: Introduce __optimize function attribute
Dan Williams <[email protected]>
x86/entry/64/compat: Clear registers for compat syscalls, to reduce speculation attack surface
Viresh Kumar <[email protected]>
arm: spear13xx: Fix spics gpio controller's warning
Viresh Kumar <[email protected]>
arm: spear13xx: Fix dmas cells
Viresh Kumar <[email protected]>
arm: spear600: Add missing interrupt-parent of rtc
Arnd Bergmann <[email protected]>
ARM: dts: nomadik: add interrupt-parent for clcd
Patrice Chotard <[email protected]>
ARM: dts: STi: Add gpio polarity for "hdmi,hpd-gpio" property
Arnd Bergmann <[email protected]>
ARM: lpc3250: fix uda1380 gpio numbers
Bjorn Andersson <[email protected]>
arm64: dts: msm8916: Correct ipc references for smsm
Eugene Syromiatnikov <[email protected]>
s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
Gang He <[email protected]>
ocfs2: try a blocking lock before return AOP_TRUNCATED_PAGE
Bjorn Andersson <[email protected]>
PM / devfreq: Propagate error from devfreq_add_device()
Shilpasri G Bhat <[email protected]>
cpufreq: powernv: Dont assume distinct pstate values for nominal and pmin
Bart Van Assche <[email protected]>
RDMA/rxe: Fix a race condition related to the QP error state
Arnd Bergmann <[email protected]>
kselftest: fix OOM in memory compaction test
Jack Morgenstein <[email protected]>
IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH ports
Mike Marciniszyn <[email protected]>
IB/qib: Fix comparison error with qperf compare/swap test
Nicholas Piggin <[email protected]>
powerpc: fix build errors in stable tree
NeilBrown <[email protected]>
dm: correctly handle chained bios in dec_pending()
James Hogan <[email protected]>
usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT
Mikulas Patocka <[email protected]>
mvpp2: fix multicast address filter
Takashi Iwai <[email protected]>
ALSA: seq: Fix racy pool initializations
Lassi Ylikojola <[email protected]>
ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204
Jan-Marek Glogowski <[email protected]>
ALSA: hda/realtek: PCI quirk for Fujitsu U7x7
Kailang Yang <[email protected]>
ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platform
Kirill Marinushkin <[email protected]>
ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attribute
Hui Wang <[email protected]>
ALSA: hda - Fix headset mic detection problem for two Dell machines
Stefan Agner <[email protected]>
mtd: nand: vf610: set correct ooblayout
Greg Kurz <[email protected]>
9p/trans_virtio: discard zero-length reply
Liu Bo <[email protected]>
Btrfs: fix unexpected -EEXIST when creating new inode
Liu Bo <[email protected]>
Btrfs: fix btrfs_evict_inode to handle abnormal inodes correctly
Liu Bo <[email protected]>
Btrfs: fix extent state leak from tree log
Liu Bo <[email protected]>
Btrfs: fix crash due to not cleaning up tree log block's dirty bits
Liu Bo <[email protected]>
Btrfs: fix deadlock in run_delalloc_nocow
David Disseldorp <[email protected]>
target/iscsi: avoid NULL dereference in CHAP auth error path
Larry Finger <[email protected]>
rtlwifi: rtl8821ae: Fix connection lost problem correctly
Nicolas Pitre <[email protected]>
console/dummy: leave .con_font_get set to NULL
Johan Hovold <[email protected]>
video: fbdev: atmel_lcdfb: fix display-timings lookup
Johan Hovold <[email protected]>
PCI: keystone: Fix interrupt-controller-node lookup
Corentin Labbe <[email protected]>
MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN
Jan H. Schönherr <[email protected]>
mm: Fix memory size alignment in devm_memremap_pages_release()
Arnd Bergmann <[email protected]>
mm: hide a #warning for COMPILE_TEST
Ernesto A. Fernández <[email protected]>
ext4: correct documentation for grpid mount option
Zhouyi Zhou <[email protected]>
ext4: save error to disk in __ext4_grp_locked_error()
Harshad Shirwadkar <[email protected]>
ext4: fix a race in the ext4 shutdown path
Tobin C. Harding <[email protected]>
jbd2: fix sphinx kernel-doc build warnings
Alexander Potapenko <[email protected]>
mbcache: initialize entry->e_referenced in mb_cache_entry_create()
Stewart Smith <[email protected]>
rtc-opal: Fix handling of firmware error codes, prevent busy loops
Julia Lawall <[email protected]>
drm/radeon: adjust tested variable
Alex Deucher <[email protected]>
drm/radeon: Add dpm quirk for Jet PRO (v2)
Steffen Weber <[email protected]>
scsi: smartpqi: allow static build ("built-in")
-------------
Diffstat:
Documentation/devicetree/bindings/dma/snps-dma.txt | 2 +- Documentation/filesystems/ext4.txt | 2 +- Makefile | 4 +- arch/arm/boot/dts/arm-realview-eb-mp.dtsi | 5 - arch/arm/boot/dts/exynos5410.dtsi | 1 - arch/arm/boot/dts/lpc3250-ea3250.dts | 4 +- arch/arm/boot/dts/lpc3250-phy3250.dts | 4 +- arch/arm/boot/dts/mt2701.dtsi | 2 + arch/arm/boot/dts/s5pv210.dtsi | 1 + arch/arm/boot/dts/spear1310-evb.dts | 2 +- arch/arm/boot/dts/spear1340.dtsi | 4 +- arch/arm/boot/dts/spear13xx.dtsi | 6 +- arch/arm/boot/dts/spear600.dtsi | 1 + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 + arch/arm/boot/dts/stih407.dtsi | 3 +- arch/arm/boot/dts/stih410.dtsi | 3 +- arch/arm/mach-pxa/tosa-bt.c | 4 + arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 +- arch/mips/Kconfig | 12 +- arch/powerpc/kernel/entry_64.S | 5 + arch/s390/kernel/compat_linux.c | 8 +- arch/x86/entry/entry_64_compat.S | 30 ++ arch/x86/events/intel/core.c | 2 +- arch/x86/events/intel/lbr.c | 2 +- arch/x86/events/intel/p6.c | 2 +- arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/barrier.h | 2 +- arch/x86/include/asm/nospec-branch.h | 1 + arch/x86/include/asm/processor.h | 4 +- arch/x86/kernel/amd_nb.c | 2 +- arch/x86/kernel/asm-offsets_32.c | 2 +- arch/x86/kernel/cpu/amd.c | 26 +- arch/x86/kernel/cpu/bugs.c | 28 +- arch/x86/kernel/cpu/centaur.c | 4 +- arch/x86/kernel/cpu/common.c | 10 +- arch/x86/kernel/cpu/cyrix.c | 2 +- arch/x86/kernel/cpu/intel.c | 31 +- arch/x86/kernel/cpu/microcode/intel.c | 6 +- arch/x86/kernel/cpu/mtrr/generic.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 4 +- arch/x86/kernel/cpu/proc.c | 8 +- arch/x86/kernel/head_32.S | 4 +- arch/x86/kernel/mpparse.c | 2 +- arch/x86/kvm/mmu.c | 10 +- arch/x86/kvm/vmx.c | 4 +- arch/x86/lib/cpu.c | 2 +- drivers/char/hw_random/via-rng.c | 2 +- drivers/cpufreq/acpi-cpufreq.c | 2 +- drivers/cpufreq/longhaul.c | 6 +- drivers/cpufreq/p4-clockmod.c | 2 +- drivers/cpufreq/powernow-k7.c | 2 +- drivers/cpufreq/powernv-cpufreq.c | 4 +- drivers/cpufreq/speedstep-centrino.c | 4 +- drivers/cpufreq/speedstep-lib.c | 6 +- drivers/crypto/padlock-aes.c | 2 +- drivers/devfreq/devfreq.c | 2 +- drivers/edac/amd64_edac.c | 2 +- drivers/edac/mce_amd.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 5 + drivers/hwmon/coretemp.c | 6 +- drivers/hwmon/hwmon-vid.c | 2 +- drivers/hwmon/k10temp.c | 2 +- drivers/hwmon/k8temp.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 13 +- drivers/infiniband/hw/qib/qib_rc.c | 6 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 + drivers/md/dm.c | 3 +- drivers/media/tuners/r820t.c | 13 +- drivers/mmc/host/sdhci-of-esdhc.c | 8 + drivers/mtd/nand/vf610_nfc.c | 6 +- drivers/net/ethernet/marvell/mvpp2.c | 11 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 3 + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 5 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + drivers/pci/host/pci-keystone.c | 5 +- drivers/rtc/rtc-opal.c | 12 +- drivers/scsi/smartpqi/Makefile | 2 +- drivers/target/iscsi/iscsi_target_auth.c | 3 +- drivers/usb/Kconfig | 8 + drivers/usb/host/Kconfig | 8 - drivers/video/console/dummycon.c | 1 - drivers/video/fbdev/atmel_lcdfb.c | 8 +- drivers/video/fbdev/geode/video_gx.c | 2 +- fs/btrfs/inode.c | 7 +- fs/btrfs/tree-log.c | 32 +- fs/ext4/inode.c | 16 +- fs/ext4/super.c | 1 + fs/jbd2/transaction.c | 5 +- fs/mbcache.c | 1 + fs/namei.c | 3 + fs/ocfs2/dlmglue.c | 9 + include/linux/compiler-gcc.h | 4 + include/linux/compiler.h | 4 + include/linux/jbd2.h | 431 +++++++++++++-------- include/linux/kaiser.h | 2 +- include/linux/nospec.h | 36 +- kernel/memremap.c | 3 +- mm/memory.c | 2 +- net/9p/trans_virtio.c | 3 +- sound/core/seq/seq_clientmgr.c | 8 +- sound/pci/hda/patch_realtek.c | 70 ++++ sound/usb/mixer.c | 18 +- sound/usb/pcm.c | 9 + tools/testing/selftests/vm/compaction_test.c | 2 + tools/testing/selftests/x86/Makefile | 2 + tools/testing/selftests/x86/mpx-mini-test.c | 32 +- tools/testing/selftests/x86/protection_keys.c | 28 -- tools/testing/selftests/x86/single_step_syscall.c | 5 +- tools/testing/selftests/x86/test_mremap_vdso.c | 4 + 110 files changed, 766 insertions(+), 417 deletions(-)