3.18.140-stable review
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest86 patches 5 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/86 | MIPS: scall64-o32: Fix indirect syscall number loadarch/ | +1 | 0 replies | |
| 2/86 | trace: Fix preempt_enable_no_resched() abusekernel/ | +1 | 0 replies | |
| 3/86 | sched/numa: Fix a possible divide-by-zerokernel/ | +4 | 0 replies | |
| 4/86 | ceph: ensure d_name stability in ceph_dentry_hash()fs/ | +5 | 0 replies | |
| 5/86 | sunrpc: dont mark uninitialised items as VALID.net/ | +3 | 0 replies | |
| 6/86 | slip: make slhc_free() silently accept an error pointerdrivers/ | +1 | 0 replies | |
| 7/86 | fs/proc/proc_sysctl.c: Fix a NULL pointer dereferencefs/ | +4 | 0 replies | |
| 8/86 | NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.fs/ | +2 | 0 replies | |
| 9/86 | netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ONnet/ | +2 | 0 replies | |
| 10/86 | Revert "block/loop: Use global lock for ioctl() operation."drivers/ drivers/ | +24 | 0 replies | |
| 11/86 | ipv4: add sanity checks in ipv4_link_failure()net/ | +24 | 0 replies | |
| 12/86 | team: fix possible recursive locking when add slavesdrivers/ | +6 | 0 replies | |
| 13/86 | net: stmmac: move stmmac_check_ether_addr() to driver probedrivers/ | +2 | 0 replies | |
| 14/86 | qlcnic: Avoid potential NULL pointer dereferencedrivers/ | +2 | 0 replies | |
| 15/86 | usb: gadget: net2280: Fix overrun of OUT messagesdrivers/ | +1 | 0 replies | |
| 16/86 | usb: gadget: net2272: Fix net2272_dequeue()drivers/ | +1 | 0 replies | |
| 17/86 | net: ks8851: Dequeue RX packets explicitlydrivers/ | +4 | 0 replies | |
| 18/86 | net: ks8851: Reassert reset pin if chip ID check failsdrivers/ | +1 | 0 replies | |
| 19/86 | net: ks8851: Delay requesting IRQ until openeddrivers/ | +11 | 0 replies | |
| 20/86 | net: ks8851: Set initial carrier state to downdrivers/ | +2 | 0 replies | |
| 21/86 | net: ibm: fix possible object reference leakdrivers/ | +1 | 0 replies | |
| 22/86 | scsi: qla4xxx: fix a potential NULL pointer dereferencedrivers/ | +2 | 0 replies | |
| 23/86 | usb: u132-hcd: fix resource leakdrivers/ | +3 | 0 replies | |
| 24/86 | ceph: fix use-after-free on symlink traversalfs/ | +1 | 0 replies | |
| 25/86 | scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCNdrivers/ | +17 | 0 replies | |
| 26/86 | libata: fix using DMA buffers on stackdrivers/ | +24 | 0 replies | |
| 27/86 | kconfig/[mn]conf: handle backspace (^H) keyscripts/ scripts/ scripts/ | +5 | 0 replies | |
| 28/86 | ipv4: ip_do_fragment: Preserve skb_iif during fragmentationnet/ | +1 | 0 replies | |
| 29/86 | ipv6: invert flowlabel sharing check in process and user modenet/ | +2 | 0 replies | |
| 30/86 | packet: validate msg_namelen in send directlynet/ | +14 | 0 replies | |
| 31/86 | ipv6/flowlabel: wait rcu grace period before put_pid()net/ | +12 | 0 replies | |
| 32/86 | USB: yurex: Fix protection fault after device removaldrivers/ | +1 | 0 replies | |
| 33/86 | USB: w1 ds2490: Fix bug caused by improper use of altsetting arraydrivers/ | +3 | 0 replies | |
| 34/86 | USB: core: Fix unterminated string returned by usb_string()drivers/ | +3 | 0 replies | |
| 35/86 | USB: media: disable tlg2300 driverdrivers/ | +1 | 0 replies | |
| 36/86 | USB: core: Fix bug caused by duplicate interface PM usage counterDocumentation/ drivers/ drivers/ +1 more | +14 | 0 replies | |
| 37/86 | HID: debug: fix race condition with between rdesc_show() and device removaldrivers/ | +5 | 0 replies | |
| 38/86 | rtc: sh: Fix invalid alarm warning for non-enabled alarmdrivers/ | +1 | 0 replies | |
| 39/86 | igb: Fix WARN_ONCE on runtime suspenddrivers/ drivers/ | +10 | 0 replies | |
| 40/86 | bonding: show full hw address in sysfs for slave entriesdrivers/ | +3 | 0 replies | |
| 41/86 | jffs2: fix use-after-free on symlink traversalfs/ fs/ | +4 | 0 replies | |
| 42/86 | scsi: storvsc: Fix calculation of sub-channel countdrivers/ | +11 | 0 replies | |
| 43/86 | hugetlbfs: fix memory leak for resv_mapfs/ | +14 | 0 replies | |
| 44/86 | xsysace: Fix error handling in ace_setupdrivers/ | +2 | 0 replies | |
| 45/86 | ARM: orion: dont use using 64-bit DMA masksarch/ | +2 | 0 replies | |
| 46/86 | ARM: iop: dont use using 64-bit DMA masksarch/ arch/ arch/ | +12 | 0 replies | |
| 47/86 | usb: usbip: fix isoc packet num validation in get_pipedrivers/ drivers/ | +10 | 0 replies | |
| 48/86 | staging: iio: adt7316: allow adt751x to use internal vref for all dacsdrivers/ | +1 | 0 replies | |
| 49/86 | staging: iio: adt7316: fix the dac read calculationdrivers/ | +8 | 0 replies | |
| 50/86 | staging: iio: adt7316: fix the dac write calculationdrivers/ | +7 | 0 replies | |
| 51/86 | media: v4l2: i2c: ov7670: Fix PLL bypass register valuesdrivers/ | +6 | 0 replies | |
| 52/86 | scsi: libsas: fix a race condition when smp task timeoutdrivers/ | +4 | 0 replies | |
| 53/86 | ASoC:soc-pcm:fix a codec fixup issue in TDM casesound/ | +5 | 0 replies | |
| 54/86 | ASoC: cs4270: Set auto-increment bit for register writessound/ | +1 | 0 replies | |
| 55/86 | ASoC: tlv320aic32x4: Fix Common Pinssound/ | +2 | 0 replies | |
| 56/86 | scsi: csiostor: fix missing data copy in csio_scsi_err_handler()drivers/ | +4 | 0 replies | |
| 57/86 | iommu/amd: Set exclusion range correctlydrivers/ | +1 | 0 replies | |
| 58/86 | genirq: Prevent use-after-free and work list corruptionkernel/ | +3 | 0 replies | |
| 59/86 | scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routinesdrivers/ | +2 | 0 replies | |
| 60/86 | Bluetooth: hidp: fix buffer overflownet/ | +1 | 0 replies | |
| 61/86 | Bluetooth: Align minimum encryption key size for LE and BR/EDR connectionsinclude/ net/ | +11 | 0 replies | |
| 62/86 | timer/debug: Change /proc/timer_stats from 0644 to 0600kernel/ | +1 | 0 replies | |
| 63/86 | netfilter: compat: initialize all fields in xt_initnet/ | +1 | 0 replies | |
| 64/86 | platform/x86: sony-laptop: Fix unintentional fall-throughdrivers/ | +5 | 0 replies | |
| 65/86 | iio: adc: xilinx: fix potential use-after-free on removedrivers/ | +1 | 0 replies | |
| 66/86 | HID: input: add mapping for keyboard Brightness Up/Down/Toggle keysdrivers/ | +4 | 0 replies | |
| 67/86 | s390/dasd: Fix capacity calculation for large volumesdrivers/ | +3 | 0 replies | |
| 68/86 | s390/3270: fix lockdep false positive on view->lockdrivers/ drivers/ drivers/ +2 more | +10 | 0 replies | |
| 69/86 | KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracingarch/ | +2 | 0 replies | |
| 70/86 | tools lib traceevent: Fix missing equality check for strcmptools/ | +1 | 0 replies | |
| 71/86 | init: initialize jump labels before command line option parsinginit/ | +2 | 0 replies | |
| 72/86 | s390: ctcm: fix ctcm_new_device error return codedrivers/ | +1 | 0 replies | |
| 73/86 | selftests/net: correct the return value for run_netsockteststools/ | +1 | 0 replies | |
| 74/86 | gpu: ipu-v3: dp: fix CSC handlingdrivers/ | +9 | 0 replies | |
| 75/86 | Dont jump to compute_result state from check_result statedrivers/ | +4 | 0 replies | |
| 76/86 | USB: serial: use variable for statusdrivers/ | +10 | 0 replies | |
| 77/86 | USB: serial: fix unthrottle racesdrivers/ | +32 | 0 replies | |
| 78/86 | bridge: Fix error path for kobject_init_and_add()net/ | +6 | 2 replies | |
| 79/86 | net: ucc_geth - fix Oops when changing number of buffers in the ringdrivers/ | +3 | 0 replies | |
| 80/86 | packet: Fix error path in packet_initnet/ | +20 | 0 replies | |
| 81/86 | vlan: disable SIOCSHWTSTAMP in containernet/ | +3 | 0 replies | |
| 82/86 | ipv4: Fix raw socket lookup for local trafficnet/ | +2 | 0 replies | |
| 83/86 | bonding: fix arp_validate toggling in active-backup modedrivers/ | +0 | 0 replies | |
| 84/86 | drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctldrivers/ | +13 | 0 replies | |
| 85/86 | drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctldrivers/ | +3 | 0 replies | |
| 86/86 | powerpc/booke64: set RI in default MSRarch/ | +1 | 0 replies |
Reviews trailers per patch
27 of 86 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 34 reviewers.
Cover letter [PATCH 3.18 00/86] 3.18.140-stable review
This is the start of the stable review cycle for the 3.18.140 release. There are 86 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 17 May 2019 09:04:45 AM UTC. 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/v3.x/stable-review/patch-3.18.140-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-3.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.18.140-rc1
Laurentiu Tudor <[email protected]>
powerpc/booke64: set RI in default MSR
Dan Carpenter <[email protected]>
drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
Dan Carpenter <[email protected]>
drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
Jarod Wilson <[email protected]>
bonding: fix arp_validate toggling in active-backup mode
David Ahern <[email protected]>
ipv4: Fix raw socket lookup for local traffic
Hangbin Liu <[email protected]>
vlan: disable SIOCSHWTSTAMP in container
YueHaibing <[email protected]>
packet: Fix error path in packet_init
Christophe Leroy <[email protected]>
net: ucc_geth - fix Oops when changing number of buffers in the ring
Tobin C. Harding <[email protected]>
bridge: Fix error path for kobject_init_and_add()
Johan Hovold <[email protected]>
USB: serial: fix unthrottle races
Oliver Neukum <[email protected]>
USB: serial: use variable for status
Nigel Croxon <[email protected]>
Don't jump to compute_result state from check_result state
Lucas Stach <[email protected]>
gpu: ipu-v3: dp: fix CSC handling
Po-Hsu Lin <[email protected]>
selftests/net: correct the return value for run_netsocktests
Arnd Bergmann <[email protected]>
s390: ctcm: fix ctcm_new_device error return code
Dan Williams <[email protected]>
init: initialize jump labels before command line option parsing
Rikard Falkeborn <[email protected]>
tools lib traceevent: Fix missing equality check for strcmp
Vitaly Kuznetsov <[email protected]>
KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing
Martin Schwidefsky <[email protected]>
s390/3270: fix lockdep false positive on view->lock
Peter Oberparleiter <[email protected]>
s390/dasd: Fix capacity calculation for large volumes
Dmitry Torokhov <[email protected]>
HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
Sven Van Asbroeck <[email protected]>
iio: adc: xilinx: fix potential use-after-free on remove
Gustavo A. R. Silva <[email protected]>
platform/x86: sony-laptop: Fix unintentional fall-through
Francesco Ruggeri <[email protected]>
netfilter: compat: initialize all fields in xt_init
Ben Hutchings <[email protected]>
timer/debug: Change /proc/timer_stats from 0644 to 0600
Marcel Holtmann <[email protected]>
Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
Young Xiao <[email protected]>
Bluetooth: hidp: fix buffer overflow
Andrew Vasquez <[email protected]>
scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
Prasad Sodagudi <[email protected]>
genirq: Prevent use-after-free and work list corruption
Joerg Roedel <[email protected]>
iommu/amd: Set exclusion range correctly
Varun Prakash <[email protected]>
scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
Annaliese McDermond <[email protected]>
ASoC: tlv320aic32x4: Fix Common Pins
Daniel Mack <[email protected]>
ASoC: cs4270: Set auto-increment bit for register writes
Rander Wang <[email protected]>
ASoC:soc-pcm:fix a codec fixup issue in TDM case
Jason Yan <[email protected]>
scsi: libsas: fix a race condition when smp task timeout
Jacopo Mondi <[email protected]>
media: v4l2: i2c: ov7670: Fix PLL bypass register values
Jeremy Fertic <[email protected]>
staging: iio: adt7316: fix the dac write calculation
Jeremy Fertic <[email protected]>
staging: iio: adt7316: fix the dac read calculation
Jeremy Fertic <[email protected]>
staging: iio: adt7316: allow adt751x to use internal vref for all dacs
Malte Leip <[email protected]>
usb: usbip: fix isoc packet num validation in get_pipe
Arnd Bergmann <[email protected]>
ARM: iop: don't use using 64-bit DMA masks
Arnd Bergmann <[email protected]>
ARM: orion: don't use using 64-bit DMA masks
Guenter Roeck <[email protected]>
xsysace: Fix error handling in ace_setup
Mike Kravetz <[email protected]>
hugetlbfs: fix memory leak for resv_map
Michael Kelley <[email protected]>
scsi: storvsc: Fix calculation of sub-channel count
Al Viro <[email protected]>
jffs2: fix use-after-free on symlink traversal
Konstantin Khorenko <[email protected]>
bonding: show full hw address in sysfs for slave entries
Arvind Sankar <[email protected]>
igb: Fix WARN_ONCE on runtime suspend
Geert Uytterhoeven <[email protected]>
rtc: sh: Fix invalid alarm warning for non-enabled alarm
He, Bo <[email protected]>
HID: debug: fix race condition with between rdesc_show() and device removal
Alan Stern <[email protected]>
USB: core: Fix bug caused by duplicate interface PM usage counter
Greg Kroah-Hartman <[email protected]>
USB: media: disable tlg2300 driver
Alan Stern <[email protected]>
USB: core: Fix unterminated string returned by usb_string()
Alan Stern <[email protected]>
USB: w1 ds2490: Fix bug caused by improper use of altsetting array
Alan Stern <[email protected]>
USB: yurex: Fix protection fault after device removal
Eric Dumazet <[email protected]>
ipv6/flowlabel: wait rcu grace period before put_pid()
Willem de Bruijn <[email protected]>
packet: validate msg_namelen in send directly
Willem de Bruijn <[email protected]>
ipv6: invert flowlabel sharing check in process and user mode
Shmulik Ladkani <[email protected]>
ipv4: ip_do_fragment: Preserve skb_iif during fragmentation
Changbin Du <[email protected]>
kconfig/[mn]conf: handle backspace (^H) key
raymond pang <[email protected]>
libata: fix using DMA buffers on stack
Steffen Maier <[email protected]>
scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
Al Viro <[email protected]>
ceph: fix use-after-free on symlink traversal
Mukesh Ojha <[email protected]>
usb: u132-hcd: fix resource leak
Kangjie Lu <[email protected]>
scsi: qla4xxx: fix a potential NULL pointer dereference
Wen Yang <[email protected]>
net: ibm: fix possible object reference leak
Lukas Wunner <[email protected]>
net: ks8851: Set initial carrier state to down
Lukas Wunner <[email protected]>
net: ks8851: Delay requesting IRQ until opened
Lukas Wunner <[email protected]>
net: ks8851: Reassert reset pin if chip ID check fails
Lukas Wunner <[email protected]>
net: ks8851: Dequeue RX packets explicitly
Guido Kiener <[email protected]>
usb: gadget: net2272: Fix net2272_dequeue()
Guido Kiener <[email protected]>
usb: gadget: net2280: Fix overrun of OUT messages
Aditya Pakki <[email protected]>
qlcnic: Avoid potential NULL pointer dereference
Vinod Koul <[email protected]>
net: stmmac: move stmmac_check_ether_addr() to driver probe
Hangbin Liu <[email protected]>
team: fix possible recursive locking when add slaves
Eric Dumazet <[email protected]>
ipv4: add sanity checks in ipv4_link_failure()
Greg Kroah-Hartman <[email protected]>
Revert "block/loop: Use global lock for ioctl() operation."
Florian Westphal <[email protected]>
netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON
Tetsuo Handa <[email protected]>
NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
YueHaibing <[email protected]>
fs/proc/proc_sysctl.c: Fix a NULL pointer dereference
Linus Torvalds <[email protected]>
slip: make slhc_free() silently accept an error pointer
NeilBrown <[email protected]>
sunrpc: don't mark uninitialised items as VALID.
Jeff Layton <[email protected]>
ceph: ensure d_name stability in ceph_dentry_hash()
Xie XiuQi <[email protected]>
sched/numa: Fix a possible divide-by-zero
Peter Zijlstra <[email protected]>
trace: Fix preempt_enable_no_resched() abuse
Aurelien Jarno <[email protected]>
MIPS: scall64-o32: Fix indirect syscall number load
-------------
Diffstat:
Documentation/usb/power-management.txt | 14 ++++-- Makefile | 4 +- arch/arm/mach-iop13xx/setup.c | 8 +-- arch/arm/mach-iop13xx/tpmi.c | 10 ++-- arch/arm/plat-iop/adma.c | 6 +-- arch/arm/plat-orion/common.c | 4 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/powerpc/include/asm/reg_booke.h | 2 +- arch/x86/kvm/trace.h | 4 +- drivers/ata/libata-zpodd.c | 34 +++++++++---- drivers/block/loop.c | 47 +++++++++--------- drivers/block/loop.h | 1 + drivers/block/xsysace.c | 2 + drivers/gpu/ipu-v3/ipu-dp.c | 12 +++-- drivers/hid/hid-debug.c | 5 ++ drivers/hid/hid-input.c | 4 ++ drivers/iio/adc/xilinx-xadc-core.c | 2 +- drivers/iommu/amd_iommu_init.c | 2 +- drivers/md/raid5.c | 19 ++------ drivers/media/i2c/ov7670.c | 16 +++--- drivers/media/usb/tlg2300/Kconfig | 1 + drivers/net/bonding/bond_options.c | 7 --- drivers/net/bonding/bond_sysfs_slave.c | 4 +- drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 ++- drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + drivers/net/ethernet/intel/igb/e1000_defines.h | 2 + drivers/net/ethernet/intel/igb/igb_main.c | 57 +++------------------- drivers/net/ethernet/micrel/ks8851.c | 36 +++++++------- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- drivers/net/slip/slhc.c | 2 +- drivers/net/team/team.c | 6 +++ drivers/platform/x86/sony-laptop.c | 8 +-- drivers/rtc/rtc-sh.c | 2 +- drivers/s390/block/dasd_eckd.c | 6 +-- drivers/s390/char/con3270.c | 2 +- drivers/s390/char/fs3270.c | 3 +- drivers/s390/char/raw3270.c | 3 +- drivers/s390/char/raw3270.h | 4 +- drivers/s390/char/tty3270.c | 3 +- drivers/s390/net/ctcm_main.c | 1 + drivers/s390/scsi/zfcp_fc.c | 21 ++++++-- drivers/scsi/csiostor/csio_scsi.c | 5 +- drivers/scsi/libsas/sas_expander.c | 9 ++-- drivers/scsi/qla2xxx/qla_attr.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/storvsc_drv.c | 13 ++++- drivers/staging/iio/addac/adt7316.c | 22 ++++++--- drivers/usb/core/driver.c | 13 ----- drivers/usb/core/message.c | 4 +- drivers/usb/gadget/udc/net2272.c | 1 + drivers/usb/gadget/udc/net2280.c | 4 +- drivers/usb/host/u132-hcd.c | 3 ++ drivers/usb/misc/yurex.c | 1 + drivers/usb/serial/generic.c | 57 ++++++++++++++++------ drivers/usb/storage/realtek_cr.c | 13 ++--- drivers/usb/usbip/stub_rx.c | 18 ++----- drivers/usb/usbip/usbip_common.h | 7 +++ drivers/virt/fsl_hypervisor.c | 29 ++++++----- drivers/w1/masters/ds2490.c | 6 +-- fs/ceph/dir.c | 6 ++- fs/ceph/inode.c | 2 +- fs/hugetlbfs/inode.c | 20 +++++--- fs/jffs2/readinode.c | 5 -- fs/jffs2/super.c | 5 +- fs/nfs/super.c | 3 +- fs/proc/proc_sysctl.c | 6 ++- include/linux/usb.h | 2 - include/net/bluetooth/hci_core.h | 3 ++ init/main.c | 4 +- kernel/irq/manage.c | 4 +- kernel/sched/fair.c | 4 ++ kernel/time/timer_stats.c | 2 +- kernel/trace/ring_buffer.c | 2 +- net/8021q/vlan_dev.c | 4 +- net/bluetooth/hci_conn.c | 8 +++ net/bluetooth/hidp/sock.c | 1 + net/bridge/br_if.c | 13 +++-- net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/ip_output.c | 1 + net/ipv4/raw.c | 4 +- net/ipv4/route.c | 32 ++++++++---- net/ipv6/ip6_flowlabel.c | 23 +++++---- net/netfilter/x_tables.c | 2 +- net/packet/af_packet.c | 48 ++++++++++++------ net/sunrpc/cache.c | 3 ++ scripts/kconfig/lxdialog/inputbox.c | 3 +- scripts/kconfig/nconf.c | 2 +- scripts/kconfig/nconf.gui.c | 3 +- sound/soc/codecs/cs4270.c | 1 + sound/soc/codecs/tlv320aic32x4.c | 2 + sound/soc/soc-pcm.c | 7 ++- tools/lib/traceevent/event-parse.c | 2 +- tools/testing/selftests/net/run_netsocktests | 2 +- 94 files changed, 474 insertions(+), 350 deletions(-)