From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D1B61465A8; Tue, 25 Jun 2024 09:58:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719309512; cv=none; b=T61wyeeHP7lTriGOeyhweRsb7Jt9xmu/HjOTQCmbQpHAe6Jrv5CstXZDu+J1RpN13auCddudUUH1gStOc1a3FUTkaoXbGeeFk09cLh6lhMPbNef3IlAkWN7oVERrvNFOehAdE64TmgKvVsCpczyrtkqpBNUVvbX/9FP+W3do/AA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719309512; c=relaxed/simple; bh=SgSwhVKxSUbc/K/QSYHROrYiznMf2PV3YtufWp24sEk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=YBJF2AyHEnChN0XE0lolDxuBqS+wkXZUd1S6NqsWq7TQVpO1UR1WfItU62PhQ7bbKk94hNXQAtM7SzS5yRH2/x/oma+lM5Z3Avae1NCJAJjfK/f7r2G4ff2qmdlESv8YruV7KRY/Z9ZiouJ/gmM57vE2jOb7Y9rkYno6Hup+p7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GDtOn6zY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GDtOn6zY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 583DBC32781; Tue, 25 Jun 2024 09:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719309511; bh=SgSwhVKxSUbc/K/QSYHROrYiznMf2PV3YtufWp24sEk=; h=From:To:Cc:Subject:Date:From; b=GDtOn6zYcs+XjAnObQTYGKBFjfU6NPoo3zNB9204W6htl7/pvPgU0/OWq97d61PVd DH9VqvBvcGHxMWy8G5xN6/DKvuW4GqeXd/pHdzjEMH5phQ62BDkgBrxdy9z3Rmlj85 23PCgyREXOAe4S8lzPbXGKVnfkswaarkAnWPTAII= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 6.1 000/131] 6.1.96-rc1 review Date: Tue, 25 Jun 2024 11:32:35 +0200 Message-ID: <20240625085525.931079317@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.96-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.1.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.1.96-rc1 X-KernelTest-Deadline: 2024-06-27T08:55+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the start of the stable review cycle for the 6.1.96 release. There are 131 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 Thu, 27 Jun 2024 08:54:55 +0000. 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/v6.x/stable-review/patch-6.1.96-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-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 6.1.96-rc1 Linus Torvalds Revert "mm: mmap: allow for the maximum number of bits for randomizing mmap_base by default" Andrew Ballance hid: asus: asus_report_fixup: fix potential read out of bounds Davide Caratti net/sched: unregister lockdep keys in qdisc_create/qdisc_alloc error path Martin Leung drm/amd/display: revert Exit idle optimizations before HDCP execution Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Tony Luck x86/cpu: Fix x86_match_cpu() to match just X86_VENDOR_INTEL Tony Luck x86/cpu/vfm: Add new macros to work with (vendor/family/model) values Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Tomi Valkeinen pmdomain: ti-sci: Fix duplicate PD referrals Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Adrian Hunter perf script: Show also errors for --insn-trace option Changbin Du perf: script: add raw|disasm arguments to --insn-trace option Patrice Chotard spi: stm32: qspi: Clamp stm32_qspi_get_mode() output to CCR_BUSWIDTH_4 Frank Li arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc Patrice Chotard spi: stm32: qspi: Fix dual flash mode sanity test in stm32_qspi_setup() Krzysztof Kozlowski dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Peter Xu mm/page_table_check: fix crash on ZONE_DEVICE Eric Dumazet tcp: clear tp->retrans_stamp in tcp_rcv_fastopen_synack() Rafael Aquini mm: mmap: allow for the maximum number of bits for randomizing mmap_base by default Aleksandr Nogikh kcov: don't lose track of remote references during softirqs Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Jani Nikula drm/i915/mso: using joiner is not possible with eDP MSO Edson Juliano Drosdeck ALSA: hda/realtek: Limit mic boost on N14AP7 Andy Chi ALSA: hda/realtek: fix mute/micmute LEDs don't work for ProBook 445/465 G11. Sean Christopherson KVM: x86: Always sync PIR to IRR prior to scanning I/O APIC routes Marc Zyngier KVM: arm64: Disassociate vcpus from redistributor region on teardown Breno Leitao KVM: Fix a data race on last_boosted_vcpu in kvm_vcpu_on_spin() Steve French cifs: fix typo in module parameter enable_gcm_256 Boris Burkov btrfs: retry block group reclaim without infinite loop Ignat Korchagin net: do not leave a dangling sk pointer, when socket creation fails Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve reset check Oleksij Rempel net: stmmac: Assign configured channel value to EXTTS event Florian Fainelli MIPS: dts: bcm63268: Add missing properties to the TWD node Nathan Chancellor kbuild: Remove support for Clang's ThinLTO caching Patrisious Haddad RDMA/mlx5: Add check for srq max_sge attribute Sudeep Holla firmware: psci: Fix return value from psci_system_suspend() Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Max Krummenacher arm64: dts: freescale: imx8mm-verdin: enable hysteresis on slow input pin Fabio Estevam arm64: dts: imx93-11x11-evk: Remove the 'no-sdio' property Kalle Niemi regulator: bd71815: fix ramp values Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Nikita Shubin dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() Nikita Shubin dmaengine: ioatdma: Fix error path in ioat3_dma_probe() Bjorn Helgaas dmaengine: ioat: use PCI core macros for PCIe Capability Nikita Shubin dmaengine: ioatdma: Fix leaking on version mismatch Bjorn Helgaas dmaengine: ioat: Drop redundant pci_enable_pcie_error_reporting() Li RongQing dmaengine: idxd: Fix possible Use-After-Free in irq_process_work_list Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Pavan Chebbi bnxt_en: Restore PTP tx_avail count in case of skb_pad() error Marcin Szycik ice: Fix VSI list rule with ICE_SW_LKUP_LAST type Jianguo Wu seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Simon Horman octeontx2-pf: Add error handling to VLAN unoffload handling Heng Qi virtio_net: checksum offloading handling fix Xiaolei Wang net: stmmac: No need to calculate speed divider when offload is disabled Dan Carpenter ptp: fix integer overflow in max_vclocks_store Xin Long sched: act_ct: add netns into the key of tcf_ct_flow_table Xin Long tipc: force a dst refcount before doing decryption David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Raju Lakkaraju net: phy: mxl-gpy: Remove interrupt mask clearing from config_init Xu Liang net: phy: mxl-gpy: enhance delay time required by loopback disable function Raju Lakkaraju net: lan743x: Support WOL at both the PHY and MAC appropriately Raju Lakkaraju net: lan743x: disable WOL upon resume to restore full data path operation Stefan Wahren qca_spi: Make interrupt remembering atomic Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ajrat Makhmutov ALSA: hda/realtek: Enable headset mic on IdeaPad 330-17IKB 81DM Florian Westphal bpf: Avoid splat in pskb_pull_reason Ondrej Mosnacek cipso: fix total option length computation En-Wei Wu ice: avoid IRQ collision to fix init failure on ACPI S3 resume Michal Swiatkowski ice: move RDMA init to ice_idc.c Peter Ujfalusi ALSA/hda: intel-dsp-config: Document AVS as dsp_driver option Dustin L. Howett ALSA: hda/realtek: Remove Framework Laptop 16 from quirks Masami Hiramatsu (Google) tracing: Build event generation tests only as modules Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Linus Torvalds tty: add the option to have a tty reject a new ldisc Christophe JAILLET usb: gadget: function: Remove usage of the deprecated ida_simple_xx() API Parker Newman serial: exar: adding missing CTI and Exar PCI ids Esben Haabendal serial: imx: Introduce timeout when waiting on transmitter empty Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Hans de Goede usb: dwc3: pci: Don't set "linux,phy_charger_detect" property on Lenovo Yoga Tab2 1380 Joao Pinto Avoid hw_desc array overrun in dw-axi-dmac Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Yunlei He f2fs: remove clear SB_INLINECRYPT flag in default_options Aleksandr Aprelkov iommu/arm-smmu-v3: Free MSIs in case of ENOMEM Tzung-Bi Shih power: supply: cros_usbpd: provide ID table for avoiding fallback match Ben Fradella platform/x86: p2sb: Don't init until unassigned resources have been assigned Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Stefan Binding ALSA: hda/realtek: Add quirks for Lenovo 13X Erico Nunes drm/lima: mask irqs in timeout path before hard reset Erico Nunes drm/lima: add mask irq callback to gp and pp Pierre-Louis Bossart ASoC: Intel: sof_sdw: add JD2 quirk for HP Omen 14 Arvid Norlander platform/x86: toshiba_acpi: Add quirk for buttons on Z830 Nicholas Kazlauskas drm/amd/display: Exit idle optimizations before HDCP execution Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Luke D. Jones HID: asus: fix more n-key report descriptors if n-key quirked Sean O'Brien HID: Add quirk for Logitech Casa touchpad Leon Yen wifi: mt76: mt7921s: fix potential hung tasks during chip recovery Breno Leitao netpoll: Fix race condition in netpoll_owner_active Luiz Angelo Daros de Luca net: dsa: realtek: keep default LED state in rtl8366rb Kunwu Chan kselftest: arm64: Add a null pointer check Davide Caratti net/sched: fix false lockdep warning on qdisc root lock Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet af_packet: avoid a false positive warning in packet_setsockopt() Arnd Bergmann wifi: ath9k: work around memset overflow warning Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Yonghong Song selftests/bpf: Fix flaky test btf_map_in_map/lookup_update Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Justin Stitt block/ioctl: prefer different overflow check Zqiang rcutorture: Fix invalid context warning when enable srcu barrier testing Zqiang rcutorture: Make stall-tasks directly exit when rcutorture tests end Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Jens Axboe io_uring/sqpoll: work around a potential audit memory leak Chenghai Huang crypto: hisilicon/sec - Fix memory leak for sec resource release Herbert Xu padata: Disable BH when taking works lock on MT path ------------- Diffstat: .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- Makefile | 9 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 2 +- arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 1 - arch/arm64/kvm/vgic/vgic-init.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 +++- arch/arm64/kvm/vgic/vgic.h | 2 +- arch/mips/bmips/setup.c | 3 +- arch/mips/boot/dts/brcm/bcm63268.dtsi | 2 + arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 ++ arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +++--- arch/x86/include/asm/cpu_device_id.h | 98 ++++++++++++++++++++++ arch/x86/kernel/cpu/match.c | 4 +- arch/x86/kvm/x86.c | 9 +- block/ioctl.c | 2 +- drivers/acpi/acpica/exregion.c | 23 +---- drivers/bluetooth/ath3k.c | 25 +++--- drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 +- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + drivers/dma/idxd/irq.c | 4 +- drivers/dma/ioat/init.c | 65 +++++++------- drivers/dma/ioat/registers.h | 7 -- drivers/firmware/psci/psci.c | 4 +- drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 2 + drivers/gpu/drm/i915/display/intel_dp.c | 4 + drivers/gpu/drm/lima/lima_bcast.c | 12 +++ drivers/gpu/drm/lima/lima_bcast.h | 3 + drivers/gpu/drm/lima/lima_gp.c | 8 ++ drivers/gpu/drm/lima/lima_pp.c | 18 ++++ drivers/gpu/drm/lima/lima_sched.c | 7 ++ drivers/gpu/drm/lima/lima_sched.h | 1 + drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/hid/hid-asus.c | 49 +++++------ drivers/hid/hid-ids.h | 1 + drivers/hid/hid-multitouch.c | 6 ++ drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/infiniband/hw/mlx5/srq.c | 13 +-- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/net/dsa/realtek/rtl8366rb.c | 87 +++++-------------- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_idc.c | 52 +++++++++++- drivers/net/ethernet/intel/ice/ice_main.c | 36 +++----- drivers/net/ethernet/intel/ice/ice_switch.c | 6 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 5 +- drivers/net/ethernet/microchip/lan743x_ethtool.c | 44 +++++++++- drivers/net/ethernet/microchip/lan743x_main.c | 48 +++++++++-- drivers/net/ethernet/microchip/lan743x_main.h | 28 +++++++ drivers/net/ethernet/qualcomm/qca_debug.c | 6 +- drivers/net/ethernet/qualcomm/qca_spi.c | 16 ++-- drivers/net/ethernet/qualcomm/qca_spi.h | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 40 +++++---- drivers/net/phy/mxl-gpy.c | 97 ++++++++++++++------- drivers/net/usb/ax88179_178a.c | 18 ++-- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 ++- drivers/net/wireless/ath/ath.h | 6 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 - .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 2 - drivers/net/wireless/mediatek/mt76/sdio.c | 3 +- drivers/pci/pci.c | 12 +++ drivers/platform/x86/p2sb.c | 29 +++---- drivers/platform/x86/toshiba_acpi.c | 36 +++++++- drivers/power/supply/cros_usbpd-charger.c | 11 ++- drivers/ptp/ptp_sysfs.c | 3 +- drivers/regulator/bd71815-regulator.c | 2 +- drivers/regulator/core.c | 1 + drivers/scsi/qedi/qedi_debugfs.c | 12 +-- drivers/soc/ti/ti_sci_pm_domains.c | 20 ++++- drivers/spi/spi-stm32-qspi.c | 12 ++- drivers/tty/serial/8250/8250_exar.c | 42 ++++++++++ drivers/tty/serial/imx.c | 7 +- drivers/tty/tty_ldisc.c | 6 ++ drivers/tty/vt/vt.c | 10 +++ drivers/usb/dwc3/dwc3-pci.c | 8 +- drivers/usb/gadget/function/f_hid.c | 6 +- drivers/usb/gadget/function/f_printer.c | 6 +- drivers/usb/gadget/function/rndis.c | 4 +- drivers/usb/misc/uss720.c | 22 +++-- fs/btrfs/block-group.c | 11 ++- fs/f2fs/super.c | 2 - fs/smb/client/cifsfs.c | 2 +- fs/udf/udftime.c | 11 ++- include/linux/kcov.h | 2 + include/linux/mod_devicetable.h | 2 + include/linux/tty_driver.h | 8 ++ include/net/sch_generic.h | 1 + io_uring/sqpoll.c | 8 ++ kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/kcov.c | 1 + kernel/padata.c | 8 +- kernel/rcu/rcutorture.c | 16 ++-- kernel/trace/Kconfig | 4 +- kernel/trace/preemptirq_delay_test.c | 1 + mm/page_table_check.c | 11 ++- net/batman-adv/originator.c | 2 + net/core/drop_monitor.c | 20 ++--- net/core/filter.c | 5 ++ net/core/net_namespace.c | 9 +- net/core/netpoll.c | 2 +- net/core/sock.c | 3 + net/ipv4/cipso_ipv4.c | 12 ++- net/ipv4/tcp_input.c | 1 + net/ipv6/route.c | 4 +- net/ipv6/seg6_local.c | 8 +- net/ipv6/xfrm6_policy.c | 8 +- net/netfilter/ipset/ip_set_core.c | 11 +-- net/netrom/nr_timer.c | 3 +- net/packet/af_packet.c | 26 +++--- net/sched/act_api.c | 66 ++++++++++----- net/sched/act_ct.c | 16 ++-- net/sched/sch_api.c | 1 + net/sched/sch_generic.c | 4 + net/sched/sch_htb.c | 22 +---- net/tipc/node.c | 1 + sound/hda/intel-dsp-config.c | 2 +- sound/pci/hda/patch_realtek.c | 10 ++- sound/soc/intel/boards/sof_sdw.c | 9 ++ tools/perf/Documentation/perf-script.txt | 7 +- tools/perf/builtin-script.c | 24 ++++-- tools/testing/selftests/arm64/tags/tags_test.c | 4 + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +----- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 ++- virt/kvm/kvm_main.c | 5 +- 135 files changed, 1112 insertions(+), 563 deletions(-)