Skip to content

6.1.45-rc1 review

Greg Kroah-Hartman amd-gfx damon kvm linux-patches linux-tegra lkml llvm netdev stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest127 patches 21 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/127io_uring: gate iowait schedule on having pending requestsio_uring/io_uring.c+17 -60 replies
2/127perf: Fix function pointer casekernel/events/core.c+6 -20 replies
3/127net/mlx5: Free irqs only on shutdown callbackdrivers/net/ethernet/mellanox/mlx5/core/eq.c drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c+31 -10 replies
4/127net: ipa: only reset hashed tables when supporteddrivers/net/ipa/ipa_table.c+13 -110 replies
5/127iommu/arm-smmu-v3: Work around MMU-600 erratum 1076982Documentation/arm64/silicon-errata.rst drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h+37 -00 replies
6/127iommu/arm-smmu-v3: Document MMU-700 erratum 2812531Documentation/arm64/silicon-errata.rst drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h+15 -00 replies
7/127iommu/arm-smmu-v3: Add explicit feature for nestingdrivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h+5 -00 replies
8/127iommu/arm-smmu-v3: Document nesting-related errataDocumentation/arm64/silicon-errata.rst drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c+7 -20 replies
9/127arm64: dts: imx8mm-venice-gw7903: disable disp_blk_ctrlarch/arm64/boot/dts/freescale/imx8mm-venice-gw7903.dts+4 -00 replies
10/127arm64: dts: imx8mm-venice-gw7904: disable disp_blk_ctrlarch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts+4 -00 replies
11/127arm64: dts: phycore-imx8mm: Label typo-fix of VPUarch/arm64/boot/dts/freescale/imx8mm-phycore-som.dtsi+1 -10 replies
12/127arm64: dts: phycore-imx8mm: Correction in gpio-line-namesarch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-rdk.dts arch/arm64/boot/dts/freescale/imx8mm-phycore-som.dtsi+2 -20 replies
13/127arm64: dts: imx8mn-var-som: add missing pull-up for onboard PHY reset pinmuxarch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi+1 -10 replies
14/127arm64: dts: freescale: Fix VPU G2 clockarch/arm64/boot/dts/freescale/imx8mq.dtsi+1 -10 replies
15/127firmware: smccc: Fix use of uninitialised results structuredrivers/firmware/smccc/soc_id.c+2 -30 replies
16/127lib/bitmap: workaround const_eval test build failurelib/Makefile lib/test_bitmap.c+10 -40 replies
17/127firmware: arm_scmi: Fix chan_free cleanup on SMCdrivers/firmware/arm_scmi/smc.c+11 -60 replies
18/127word-at-a-time: use the same return type for has_zero regardless of endiannessarch/powerpc/include/asm/word-at-a-time.h include/asm-generic/word-at-a-time.h+2 -20 replies
19/127KVM: s390: fix sthyi error handlingarch/s390/kernel/sthyi.c arch/s390/kvm/intercept.c+9 -60 replies
20/127erofs: fix wrong primary bvec selection on deduplicated extentsfs/erofs/zdata.c+4 -30 replies
21/127wifi: cfg80211: Fix return value in scan logicnet/wireless/scan.c+1 -10 replies
22/127net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groupsdrivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c+1 -00 replies
23/127net/mlx5: DR, fix memory leak in mlx5dr_cmd_create_reformat_ctxdrivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c+3 -20 replies
24/127net/mlx5: fix potential memory leak in mlx5e_init_rep_rxdrivers/net/ethernet/mellanox/mlx5/core/en_rep.c+2 -10 replies
25/127net/mlx5e: fix return value check in mlx5e_ipsec_remove_trailer()drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c+3 -10 replies
26/127net/mlx5e: Fix crash moving to switchdev mode when ntuple offload is setdrivers/net/ethernet/mellanox/mlx5/core/en_arfs.c+10 -00 replies
27/127net/mlx5e: Move representor neigh cleanup to profile cleanup_txdrivers/net/ethernet/mellanox/mlx5/core/en_rep.c+7 -100 replies
28/127bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsingnet/core/bpf_sk_storage.c+4 -10 replies
29/127rtnetlink: let rtnl_bridge_setlink checks IFLA_BRIDGE_MODE lengthnet/core/rtnetlink.c+6 -20 replies
30/127net: dsa: fix value check in bcm_sf2_sw_probe()drivers/net/dsa/bcm_sf2.c+6 -20 replies
31/127perf test uprobe_from_different_cu: Skip if there is no gcctools/perf/tests/shell/test_uprobe_from_different_cu.sh+7 -10 replies
32/127net: sched: cls_u32: Fix match key mis-addressingnet/sched/cls_u32.c+50 -60 replies
33/127mISDN: hfcpci: Fix potential deadlock on &hc->lockdrivers/isdn/hardware/mISDN/hfcpci.c+5 -50 replies
34/127qed: Fix scheduling in a tasklet while getting statsdrivers/net/ethernet/qlogic/qed/qed_dev_api.h drivers/net/ethernet/qlogic/qed/qed_fcoe.c drivers/net/ethernet/qlogic/qed/qed_fcoe.h +6 more+128 -260 replies
35/127net: annotate data-races around sk->sk_reserved_memnet/core/sock.c+4 -30 replies
36/127net: annotate data-race around sk->sk_txrehashnet/core/sock.c+5 -20 replies
37/127net: annotate data-races around sk->sk_max_pacing_ratenet/core/sock.c+6 -30 replies
38/127net: add missing READ_ONCE(sk->sk_rcvlowat) annotationnet/core/sock.c+1 -10 replies
39/127net: add missing READ_ONCE(sk->sk_sndbuf) annotationnet/core/sock.c+1 -10 replies
40/127net: add missing READ_ONCE(sk->sk_rcvbuf) annotationnet/core/sock.c+1 -10 replies
41/127net: annotate data-races around sk->sk_markinclude/net/inet_sock.h include/net/ip.h include/net/route.h +19 more+41 -390 replies
42/127net: add missing data-race annotations around sk->sk_peek_offnet/core/sock.c net/unix/af_unix.c+3 -30 replies
43/127net: add missing data-race annotation for sk_ll_usecnet/core/sock.c+1 -10 replies
44/127net: annotate data-races around sk->sk_prioritynet/core/sock.c net/ipv4/ip_output.c net/ipv4/ip_sockglue.c +5 more+14 -130 replies
45/127net/sched: taprio: Limit TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME to INT_MAX.net/sched/sch_taprio.c tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json+38 -20 replies
46/127ice: Fix RDMA VSI removal during queue rebuilddrivers/net/ethernet/intel/ice/ice_main.c+18 -00 replies
47/127bpf, cpumap: Handle skb as well when clean up ptr_ringkernel/bpf/cpumap.c+10 -40 replies
48/127net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-freenet/sched/cls_u32.c+0 -10 replies
49/127net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-freenet/sched/cls_fw.c+0 -10 replies
50/127net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-freenet/sched/cls_route.c+0 -10 replies
51/127bpf: sockmap: Remove preempt_disable in sock_map_sk_acquirenet/core/sock_map.c+0 -20 replies
52/127net: ll_temac: fix error checking of irq_of_parse_and_map()drivers/net/ethernet/xilinx/ll_temac_main.c+8 -40 replies
53/127net: korina: handle clk prepare error in korina_probe()drivers/net/ethernet/korina.c+1 -20 replies
54/127net: netsec: Ignore phy-mode on SynQuacer in DT modedrivers/net/ethernet/socionext/netsec.c+11 -00 replies
55/127bnxt_en: Fix page pool logic for page size >= 64Kdrivers/net/ethernet/broadcom/bnxt/bnxt.c drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c+29 -190 replies
56/127bnxt_en: Fix max_mtu setting for multi-buf XDPdrivers/net/ethernet/broadcom/bnxt/bnxt.c+10 -70 replies
57/127net: dcb: choose correct policy to parse DCB_ATTR_BCNnet/dcb/dcbnl.c+1 -10 replies
58/127s390/qeth: Dont call dev_close/dev_open (DOWN/UP)drivers/s390/net/qeth_core.h drivers/s390/net/qeth_core_main.c drivers/s390/net/qeth_l2_main.c +1 more+11 -90 replies
59/127ip6mr: Fix skb_under_panic in ip6mr_cache_report()net/ipv6/ip6mr.c+1 -10 replies
60/127vxlan: Fix nexthop hash sizeinclude/net/vxlan.h+2 -20 replies
61/127net/mlx5: fs_core: Make find_closest_ft more genericdrivers/net/ethernet/mellanox/mlx5/core/fs_core.c+14 -150 replies
62/127net/mlx5: fs_core: Skip the FTs in the same FS_TYPE_PRIO_CHAINS fs_priodrivers/net/ethernet/mellanox/mlx5/core/fs_core.c+72 -80 replies
63/127prestera: fix fallback to previous version on same major versiondrivers/net/ethernet/marvell/prestera/prestera_pci.c+2 -10 replies
64/127tcp_metrics: fix addr_same() helpernet/ipv4/tcp_metrics.c+1 -10 replies
65/127tcp_metrics: annotate data-races around tm->tcpm_stampnet/ipv4/tcp_metrics.c+13 -60 replies
66/127tcp_metrics: annotate data-races around tm->tcpm_locknet/ipv4/tcp_metrics.c+4 -20 replies
67/127tcp_metrics: annotate data-races around tm->tcpm_vals[]net/ipv4/tcp_metrics.c+14 -90 replies
68/127tcp_metrics: annotate data-races around tm->tcpm_netnet/ipv4/tcp_metrics.c+7 -40 replies
69/127tcp_metrics: fix data-race in tcpm_suck_dst() vs fastopennet/ipv4/tcp_metrics.c+5 -40 replies
70/127rust: allocator: Prevent mis-aligned allocationrust/bindings/bindings_helper.h rust/kernel/allocator.rs+60 -150 replies
71/127scsi: zfcp: Defer fc_rport blocking until after ADISC responsedrivers/s390/scsi/zfcp_fc.c+1 -50 replies
72/127scsi: storvsc: Limit max_sectors for virtual Fibre Channel devicesdrivers/scsi/storvsc_drv.c+4 -00 replies
73/127libceph: fix potential hang in ceph_osdc_notify()net/ceph/osd_client.c+14 -60 replies
74/127USB: zaurus: Add ID for A-300/B-500/C-700drivers/net/usb/cdc_ether.c drivers/net/usb/zaurus.c+42 -00 replies
75/127ceph: defer stopping mdsc delayed_workfs/ceph/mds_client.c fs/ceph/mds_client.h fs/ceph/super.c+17 -20 replies
76/127firmware: arm_scmi: Drop OF node reference in the transport channel setupdrivers/firmware/arm_scmi/mailbox.c drivers/firmware/arm_scmi/smc.c+6 -20 replies
77/127exfat: use kvmalloc_array/kvfree instead of kmalloc_array/kfreefs/exfat/balloc.c+3 -30 replies
78/127exfat: release s_lock before calling dir_emit()fs/exfat/dir.c+12 -150 replies
79/127mtd: spinand: toshiba: Fix ecc_get_statusdrivers/mtd/nand/spi/toshiba.c+2 -20 replies
80/127mtd: rawnand: meson: fix OOB available bytes for ECCdrivers/mtd/nand/raw/meson_nand.c+1 -20 replies
81/127bpf: Disable preemption in bpf_perf_event_outputkernel/trace/bpf_trace.c+7 -40 replies
82/127arm64: dts: stratix10: fix incorrect I2C property for SCL signalarch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts+2 -20 replies
83/127net: tun_chr_open(): set sk_uid from current_fsuid()drivers/net/tun.c+1 -10 replies
84/127net: tap_open(): set sk_uid from current_fsuid()drivers/net/tap.c+1 -10 replies
85/127wifi: mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC)drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c+3 -30 replies
86/127x86/hyperv: Disable IBT when hypercall page lacks ENDBR instructionarch/x86/hyperv/hv_init.c+21 -00 replies
87/127rbd: prevent busy loop when requesting exclusive lockdrivers/block/rbd.c+15 -130 replies
88/127bpf: Disable preemption in bpf_event_outputkernel/trace/bpf_trace.c+5 -10 replies
89/127powerpc/ftrace: Create a dummy stackframe to fix stack unwindarch/powerpc/kernel/trace/ftrace_mprofile.S+7 -20 replies
90/127arm64/fpsimd: Sync and zero pad FPSIMD state for streaming SVEarch/arm64/kernel/fpsimd.c+2 -10 replies
91/127arm64/fpsimd: Clear SME state in the target task when setting the VLarch/arm64/kernel/fpsimd.c+1 -10 replies
92/127arm64/fpsimd: Sync FPSIMD state with SVE for SME only systemsarch/arm64/kernel/fpsimd.c+2 -20 replies
93/127open: make RESOLVE_CACHED correctly test for O_TMPFILEfs/open.c+1 -10 replies
94/127drm/ttm: check null pointer before accessing when swappingdrivers/gpu/drm/ttm/ttm_bo.c+2 -10 replies
95/127drm/i915: Fix premature release of requests reusable memorydrivers/gpu/drm/i915/i915_active.c drivers/gpu/drm/i915/i915_request.c+81 -290 replies
96/127drm/i915/gt: Cleanup aux invalidation registersdrivers/gpu/drm/i915/gt/gen8_engine_cs.c drivers/gpu/drm/i915/gt/intel_gt_regs.h drivers/gpu/drm/i915/gt/intel_lrc.c+15 -150 replies
97/127clk: imx93: Propagate correct error in imx93_clocks_probe()drivers/clk/imx/clk-imx93.c+1 -10 replies
98/127bpf, cpumap: Make sure kthread is running before map update returnskernel/bpf/cpumap.c+11 -100 replies
99/127file: reinstate f_pos locking optimization for regular filesfs/file.c+17 -10 replies
100/127mm: kmem: fix a NULL pointer dereference in obj_stock_flush_required()mm/memcontrol.c+10 -90 replies
101/127fs/ntfs3: Use __GFP_NOWARN allocation at ntfs_load_attr_list()fs/ntfs3/attrlist.c+2 -20 replies
102/127fs/sysv: Null check to prevent null-ptr-deref bugfs/sysv/itree.c+4 -00 replies
103/127Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cbnet/bluetooth/l2cap_sock.c+2 -00 replies
104/127debugobjects: Recheck debug_objects_enabled before reportinglib/debugobjects.c+9 -00 replies
105/127net: usbnet: Fix WARNING in usbnet_start_xmit/usb_submit_urbdrivers/net/usb/usbnet.c+6 -00 replies
106/127fs: Protect reconfiguration of sb read-write from racing writesfs/super.c+10 -10 replies
107/127ext2: Drop fragment supportfs/ext2/ext2.h fs/ext2/super.c+4 -310 replies
108/127btrfs: remove BUG_ON()s in add_new_free_space()fs/btrfs/block-group.c fs/btrfs/block-group.h fs/btrfs/free-space-tree.c+53 -260 replies
109/127f2fs: fix to do sanity check on direct node in truncate_dnode()fs/f2fs/f2fs.h fs/f2fs/file.c fs/f2fs/node.c +1 more+13 -80 replies
110/127io_uring: annotate offset timeout racesio_uring/timeout.c+1 -10 replies
111/127mtd: rawnand: omap_elm: Fix incorrect type in assignmentdrivers/mtd/nand/raw/omap_elm.c+12 -120 replies
112/127mtd: rawnand: rockchip: fix oobfree offset and descriptiondrivers/mtd/nand/raw/rockchip-nand-controller.c+4 -70 replies
113/127mtd: rawnand: rockchip: Align hwecc vs. raw page helper layoutsdrivers/mtd/nand/raw/rockchip-nand-controller.c+21 -130 replies
114/127mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op()drivers/mtd/nand/raw/fsl_upm.c+1 -10 replies
115/127powerpc/mm/altmap: Fix altmap boundary checkarch/powerpc/mm/init_64.c+1 -20 replies
116/127drm/imx/ipuv3: Fix front porch adjustment upon hactive aligningdrivers/gpu/drm/imx/ipuv3-crtc.c+1 -10 replies
117/127drm/amd/display: Ensure that planes are in the same orderdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+15 -00 replies
118/127drm/amd/display: skip CLEAR_PAYLOAD_ID_TABLE if device mst_en is 0drivers/gpu/drm/amd/display/dc/core/dc_link.c+4 -10 replies
119/127selftests/rseq: Play nice with binaries statically linked against glibc 2.35+tools/testing/selftests/rseq/rseq.c+22 -60 replies
120/127f2fs: fix to set flush_merge opt and show noflush_mergefs/f2fs/super.c+11 -20 replies
121/127f2fs: dont reset unchangable mount option in f2fs_remount()fs/f2fs/super.c+18 -120 replies
122/127exfat: check if filename entries exceeds max filename lengthfs/exfat/dir.c+7 -20 replies
123/127arm64/ptrace: Dont enable SVE when setting streaming SVEarch/arm64/kernel/ptrace.c+5 -30 replies
124/127drm/amdgpu: add vram reservation based on vram_usagebyfirmware_v2_2drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1 more+191 -320 replies
125/127drm/amdgpu: Remove unnecessary domain argumentdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c drivers/gpu/drm/amd/amdgpu/amdgpu_object.h drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 more+6 -140 replies
126/127drm/amdgpu: Use apt name for FW reserved regiondrivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h+21 -150 replies
127/127Revert "drm/i915: Disable DC states for all commits"drivers/gpu/drm/i915/display/intel_display.c+3 -250 replies

Reviews trailers per patch

70 of 127 patches have a Reviewed-by or Acked-by.

PatchAndres FreundFabio EstevamMarc ZyngierNick DesaulniersAlexander LobakinNathan ChancellorHeiko CarstensChristian BorntraegerYue HuChao YuDouglas AndersonSimon HormanLeon RomanovskyTariq ToukanAya LevinVlad BuslovJakub KicinskiNikolay AleksandrovHangbin LiuFlorian FainelliIan RogersNicolin ChenVinicius Costa GomesBharathi SreenivasJesper Dangaard BrouerVictor NogueiraPedro TammelaM A RamdhanJakub SitnickiJohn FastabendEsben HaabendalYang YingliangHarini KatakamArd BiesheuvelIlias ApalodimasAndrew LunnAndy GospodarekSomnath KoturAjit KhapardeWenjia ZhangEric DumazetIdo SchimmelPaul BlakeyElad NachmanJesse BrandeburgTaras ChornyiDavid AhernKuniyuki IwashimaCristian Marussi[email protected]Hou TaoFelix FietkauDongsheng YangMikhail GavrilovAlex DeucherChristian KönigAndi ShytiNirmoy DasAndrzej HajdaPeng FanPu LehuiVlastimil BabkaBenjamin BlockFedor LoshakovXiubo LiGreg Kroah-HartmanMilind ChangireYosry AhmedShakeel ButtDmitry Vyukov[email protected]Dan CarpenterDavid HildenbrandPhilipp ZabelHarry WentlandQingqing ZhuoDaniel WheelerGeorge ShenSungjong SeoLe Ma[email protected]David SterbaJoel Fernandes (Google)SeongJae ParkBagas SanjayaTakeshi OgasawaraRon EconomosConor DooleyMiguel OjedaThierry Reding
SeriesT-b T-b T-b T-b T-b T-b T-b T-b T-b
1/127T-b
2/127
3/127
4/127T-b
5/127R-b T-b
6/127R-b
7/127R-b
8/127R-b
9/127
10/127
11/127
12/127
13/127R-b
14/127
15/127A-b
16/127R-b R-b
17/127
18/127Debugged-by A-b
19/127R-b
20/127R-b R-b
21/127
22/127R-b R-b
23/127R-b
24/127R-b R-b
25/127R-b
26/127R-b
27/127R-b
28/127R-b
29/127A-b R-b
30/127R-b
31/127A-b
32/127
33/127
34/127R-b
35/127
36/127
37/127
38/127
39/127
40/127
41/127
42/127
43/127
44/127
45/127A-b
46/127R-b T-b
47/127A-b
48/127R-b R-b R-b
49/127R-b R-b R-b
50/127R-b R-b R-b
51/127R-b R-b
52/127A-b R-b R-b
53/127
54/127A-b A-b R-b
55/127R-b
56/127R-b R-b R-b
57/127R-b
58/127R-b
59/127R-b
60/127R-b R-b
61/127
62/127R-b
63/127A-b R-b A-b
64/127R-b R-b
65/127R-b R-b
66/127R-b R-b
67/127R-b R-b
68/127R-b R-b
69/127R-b
70/127A-b
71/127R-b R-b
72/127
73/127R-b R-b
74/127R-b A-b
75/127R-b
76/127R-b
77/127
78/127T-b
79/127
80/127
81/127A-b
82/127
83/127
84/127
85/127R-b A-b
86/127
87/127R-b
88/127A-b
89/127
90/127
91/127
92/127
93/127
94/127T-b R-b R-b
95/127R-b
96/127R-b R-b
97/127R-b
98/127A-b R-b
99/127
100/127R-b A-b R-b
101/127
102/127
103/127
104/127
105/127Reported-and-tested-by
106/127
107/127
108/127R-b
109/127Reported-and-tested-by
110/127
111/127
112/127
113/127
114/127R-b
115/127R-b
116/127R-b
117/127R-b A-b T-b
118/127A-b T-b R-b
119/127
120/127
121/127
122/127R-b
123/127
124/127A-b
125/127R-b
126/127R-b
127/127

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

Read the v1 thread

Cover letter [PATCH 6.1 000/127] 6.1.45-rc1 review

This is the start of the stable review cycle for the 6.1.45 release. There are 127 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, 11 Aug 2023 10:36:10 +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.45-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 <[email protected]>

    Linux 6.1.45-rc1

Greg Kroah-Hartman <[email protected]>
Revert "drm/i915: Disable DC states for all commits"

Lijo Lazar <[email protected]>
drm/amdgpu: Use apt name for FW reserved region

Luben Tuikov <[email protected]>
drm/amdgpu: Remove unnecessary domain argument

Tong Liu01 <[email protected]>
drm/amdgpu: add vram reservation based on vram_usagebyfirmware_v2_2

Mark Brown <[email protected]>
arm64/ptrace: Don't enable SVE when setting streaming SVE

Namjae Jeon <[email protected]>
exfat: check if filename entries exceeds max filename length

Chao Yu <[email protected]>
f2fs: don't reset unchangable mount option in f2fs_remount()

Yangtao Li <[email protected]>
f2fs: fix to set flush_merge opt and show noflush_merge

Sean Christopherson <[email protected]>
selftests/rseq: Play nice with binaries statically linked against glibc 2.35+

Peichen Huang <[email protected]>
drm/amd/display: skip CLEAR_PAYLOAD_ID_TABLE if device mst_en is 0

Rodrigo Siqueira <[email protected]>
drm/amd/display: Ensure that planes are in the same order

Alexander Stein <[email protected]>
drm/imx/ipuv3: Fix front porch adjustment upon hactive aligning

Aneesh Kumar K.V <[email protected]>
powerpc/mm/altmap: Fix altmap boundary check

Christophe JAILLET <[email protected]>
mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op()

Johan Jonker <[email protected]>
mtd: rawnand: rockchip: Align hwecc vs. raw page helper layouts

Johan Jonker <[email protected]>
mtd: rawnand: rockchip: fix oobfree offset and description

Roger Quadros <[email protected]>
mtd: rawnand: omap_elm: Fix incorrect type in assignment

Pavel Begunkov <[email protected]>
io_uring: annotate offset timeout races

Chao Yu <[email protected]>
f2fs: fix to do sanity check on direct node in truncate_dnode()

Filipe Manana <[email protected]>
btrfs: remove BUG_ON()'s in add_new_free_space()

Jan Kara <[email protected]>
ext2: Drop fragment support

Jan Kara <[email protected]>
fs: Protect reconfiguration of sb read-write from racing writes

Alan Stern <[email protected]>
net: usbnet: Fix WARNING in usbnet_start_xmit/usb_submit_urb

Tetsuo Handa <[email protected]>
debugobjects: Recheck debug_objects_enabled before reporting

Sungwoo Kim <[email protected]>
Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb

Prince Kumar Maurya <[email protected]>
fs/sysv: Null check to prevent null-ptr-deref bug

Tetsuo Handa <[email protected]>
fs/ntfs3: Use __GFP_NOWARN allocation at ntfs_load_attr_list()

Roman Gushchin <[email protected]>
mm: kmem: fix a NULL pointer dereference in obj_stock_flush_required()

Linus Torvalds <[email protected]>
file: reinstate f_pos locking optimization for regular files

Hou Tao <[email protected]>
bpf, cpumap: Make sure kthread is running before map update returns

Geert Uytterhoeven <[email protected]>
clk: imx93: Propagate correct error in imx93_clocks_probe()

Andi Shyti <[email protected]>
drm/i915/gt: Cleanup aux invalidation registers

Janusz Krzysztofik <[email protected]>
drm/i915: Fix premature release of request's reusable memory

Guchun Chen <[email protected]>
drm/ttm: check null pointer before accessing when swapping

Aleksa Sarai <[email protected]>
open: make RESOLVE_CACHED correctly test for O_TMPFILE

Mark Brown <[email protected]>
arm64/fpsimd: Sync FPSIMD state with SVE for SME only systems

Mark Brown <[email protected]>
arm64/fpsimd: Clear SME state in the target task when setting the VL

Mark Brown <[email protected]>
arm64/fpsimd: Sync and zero pad FPSIMD state for streaming SVE

Naveen N Rao <[email protected]>
powerpc/ftrace: Create a dummy stackframe to fix stack unwind

Jiri Olsa <[email protected]>
bpf: Disable preemption in bpf_event_output

Ilya Dryomov <[email protected]>
rbd: prevent busy loop when requesting exclusive lock

Michael Kelley <[email protected]>
x86/hyperv: Disable IBT when hypercall page lacks ENDBR instruction

Paul Fertser <[email protected]>
wifi: mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC)

Laszlo Ersek <[email protected]>
net: tap_open(): set sk_uid from current_fsuid()

Laszlo Ersek <[email protected]>
net: tun_chr_open(): set sk_uid from current_fsuid()

Dinh Nguyen <[email protected]>
arm64: dts: stratix10: fix incorrect I2C property for SCL signal

Jiri Olsa <[email protected]>
bpf: Disable preemption in bpf_perf_event_output

Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix OOB available bytes for ECC

Olivier Maignial <[email protected]>
mtd: spinand: toshiba: Fix ecc_get_status

Sungjong Seo <[email protected]>
exfat: release s_lock before calling dir_emit()

gaoming <[email protected]>
exfat: use kvmalloc_array/kvfree instead of kmalloc_array/kfree

Krzysztof Kozlowski <[email protected]>
firmware: arm_scmi: Drop OF node reference in the transport channel setup

Xiubo Li <[email protected]>
ceph: defer stopping mdsc delayed_work

Ross Maynard <[email protected]>

    USB: zaurus: Add ID for A-300/B-500/C-700

Ilya Dryomov <[email protected]>
libceph: fix potential hang in ceph_osdc_notify()

Michael Kelley <[email protected]>
scsi: storvsc: Limit max_sectors for virtual Fibre Channel devices

Steffen Maier <[email protected]>
scsi: zfcp: Defer fc_rport blocking until after ADISC response

Boqun Feng <[email protected]>
rust: allocator: Prevent mis-aligned allocation

Eric Dumazet <[email protected]>
tcp_metrics: fix data-race in tcpm_suck_dst() vs fastopen

Eric Dumazet <[email protected]>

    tcp_metrics: annotate data-races around tm->tcpm_net

Eric Dumazet <[email protected]>

    tcp_metrics: annotate data-races around tm->tcpm_vals[]

Eric Dumazet <[email protected]>

    tcp_metrics: annotate data-races around tm->tcpm_lock

Eric Dumazet <[email protected]>

    tcp_metrics: annotate data-races around tm->tcpm_stamp

Eric Dumazet <[email protected]>
tcp_metrics: fix addr_same() helper

Jonas Gorski <[email protected]>
prestera: fix fallback to previous version on same major version

Jianbo Liu <[email protected]>
net/mlx5: fs_core: Skip the FTs in the same FS_TYPE_PRIO_CHAINS fs_prio

Jianbo Liu <[email protected]>
net/mlx5: fs_core: Make find_closest_ft more generic

Benjamin Poirier <[email protected]>
vxlan: Fix nexthop hash size

Yue Haibing <[email protected]>
ip6mr: Fix skb_under_panic in ip6mr_cache_report()

Alexandra Winter <[email protected]>
s390/qeth: Don't call dev_close/dev_open (DOWN/UP)

Lin Ma <[email protected]>
net: dcb: choose correct policy to parse DCB_ATTR_BCN

Michael Chan <[email protected]>
bnxt_en: Fix max_mtu setting for multi-buf XDP

Somnath Kotur <[email protected]>
bnxt_en: Fix page pool logic for page size >= 64K

Mark Brown <[email protected]>
net: netsec: Ignore 'phy-mode' on SynQuacer in DT mode

Yuanjun Gong <[email protected]>
net: korina: handle clk prepare error in korina_probe()

Dan Carpenter <[email protected]>
net: ll_temac: fix error checking of irq_of_parse_and_map()

Tomas Glozar <[email protected]>
bpf: sockmap: Remove preempt_disable in sock_map_sk_acquire

valis <[email protected]>
net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free

valis <[email protected]>
net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free

valis <[email protected]>
net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free

Hou Tao <[email protected]>
bpf, cpumap: Handle skb as well when clean up ptr_ring

Rafal Rogalski <[email protected]>
ice: Fix RDMA VSI removal during queue rebuild

Kuniyuki Iwashima <[email protected]>
net/sched: taprio: Limit TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME to INT_MAX.

Eric Dumazet <[email protected]>

    net: annotate data-races around sk->sk_priority

Eric Dumazet <[email protected]>
net: add missing data-race annotation for sk_ll_usec

Eric Dumazet <[email protected]>

    net: add missing data-race annotations around sk->sk_peek_off

Eric Dumazet <[email protected]>

    net: annotate data-races around sk->sk_mark

Eric Dumazet <[email protected]>

    net: add missing READ_ONCE(sk->sk_rcvbuf) annotation

Eric Dumazet <[email protected]>

    net: add missing READ_ONCE(sk->sk_sndbuf) annotation

Eric Dumazet <[email protected]>

    net: add missing READ_ONCE(sk->sk_rcvlowat) annotation

Eric Dumazet <[email protected]>

    net: annotate data-races around sk->sk_max_pacing_rate

Eric Dumazet <[email protected]>

    net: annotate data-race around sk->sk_txrehash

Eric Dumazet <[email protected]>

    net: annotate data-races around sk->sk_reserved_mem

Konstantin Khorenko <[email protected]>
qed: Fix scheduling in a tasklet while getting stats

Chengfeng Ye <[email protected]>

    mISDN: hfcpci: Fix potential deadlock on &hc->lock

Jamal Hadi Salim <[email protected]>
net: sched: cls_u32: Fix match key mis-addressing

Georg Müller <[email protected]>
perf test uprobe_from_different_cu: Skip if there is no gcc

Yuanjun Gong <[email protected]>
net: dsa: fix value check in bcm_sf2_sw_probe()

Lin Ma <[email protected]>
rtnetlink: let rtnl_bridge_setlink checks IFLA_BRIDGE_MODE length

Lin Ma <[email protected]>
bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsing

Jianbo Liu <[email protected]>
net/mlx5e: Move representor neigh cleanup to profile cleanup_tx

Amir Tzin <[email protected]>
net/mlx5e: Fix crash moving to switchdev mode when ntuple offload is set

Yuanjun Gong <[email protected]>
net/mlx5e: fix return value check in mlx5e_ipsec_remove_trailer()

Zhengchao Shao <[email protected]>
net/mlx5: fix potential memory leak in mlx5e_init_rep_rx

Zhengchao Shao <[email protected]>
net/mlx5: DR, fix memory leak in mlx5dr_cmd_create_reformat_ctx

Zhengchao Shao <[email protected]>
net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups

Ilan Peer <[email protected]>
wifi: cfg80211: Fix return value in scan logic

Gao Xiang <[email protected]>
erofs: fix wrong primary bvec selection on deduplicated extents

Heiko Carstens <[email protected]>
KVM: s390: fix sthyi error handling

[email protected] <[email protected]>
word-at-a-time: use the same return type for has_zero regardless of endianness

Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix chan_free cleanup on SMC

Yury Norov <[email protected]>
lib/bitmap: workaround const_eval test build failure

Punit Agrawal <[email protected]>
firmware: smccc: Fix use of uninitialised results structure

Benjamin Gaignard <[email protected]>
arm64: dts: freescale: Fix VPU G2 clock

Hugo Villeneuve <[email protected]>
arm64: dts: imx8mn-var-som: add missing pull-up for onboard PHY reset pinmux

Yashwanth Varakala <[email protected]>
arm64: dts: phycore-imx8mm: Correction in gpio-line-names

Yashwanth Varakala <[email protected]>
arm64: dts: phycore-imx8mm: Label typo-fix of VPU

Tim Harvey <[email protected]>

    arm64: dts: imx8mm-venice-gw7904: disable disp_blk_ctrl

Tim Harvey <[email protected]>

    arm64: dts: imx8mm-venice-gw7903: disable disp_blk_ctrl

Robin Murphy <[email protected]>
iommu/arm-smmu-v3: Document nesting-related errata

Robin Murphy <[email protected]>
iommu/arm-smmu-v3: Add explicit feature for nesting

Robin Murphy <[email protected]>

    iommu/arm-smmu-v3: Document MMU-700 erratum 2812531

Robin Murphy <[email protected]>

    iommu/arm-smmu-v3: Work around MMU-600 erratum 1076982

Alex Elder <[email protected]>
net: ipa: only reset hashed tables when supported

Shay Drory <[email protected]>
net/mlx5: Free irqs only on shutdown callback

Peter Zijlstra <[email protected]>
perf: Fix function pointer case

Jens Axboe <[email protected]>
io_uring: gate iowait schedule on having pending requests

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

Diffstat:

 Documentation/arm64/silicon-errata.rst             |   4 +
 Makefile                                           |   4 +-
 .../boot/dts/altera/socfpga_stratix10_socdk.dts    |   2 +-
 .../dts/altera/socfpga_stratix10_socdk_nand.dts    |   2 +-
 .../dts/freescale/imx8mm-phyboard-polis-rdk.dts    |   2 +-
 .../boot/dts/freescale/imx8mm-phycore-som.dtsi     |   4 +-
 .../boot/dts/freescale/imx8mm-venice-gw7903.dts    |   4 +
 .../boot/dts/freescale/imx8mm-venice-gw7904.dts    |   4 +
 arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi  |   2 +-
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          |   2 +-
 arch/arm64/kernel/fpsimd.c                         |   9 +-
 arch/arm64/kernel/ptrace.c                         |   8 +-
 arch/powerpc/include/asm/word-at-a-time.h          |   2 +-
 arch/powerpc/kernel/trace/ftrace_mprofile.S        |   9 +-
 arch/powerpc/mm/init_64.c                          |   3 +-
 arch/s390/kernel/sthyi.c                           |   6 +-
 arch/s390/kvm/intercept.c                          |   9 +-
 arch/x86/hyperv/hv_init.c                          |  21 +++++
 drivers/block/rbd.c                                |  28 +++---
 drivers/clk/imx/clk-imx93.c                        |   2 +-
 drivers/firmware/arm_scmi/mailbox.c                |   4 +-
 drivers/firmware/arm_scmi/smc.c                    |  21 +++--
 drivers/firmware/smccc/soc_id.c                    |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   | 104 +++++++++++++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  10 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  89 +++++++++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |   8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |   1 -
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  15 +++
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   5 +-
 drivers/gpu/drm/amd/include/atomfirmware.h         |  63 +++++++++++--
 drivers/gpu/drm/i915/display/intel_display.c       |  28 +-----
 drivers/gpu/drm/i915/gt/gen8_engine_cs.c           |   8 +-
 drivers/gpu/drm/i915/gt/intel_gt_regs.h            |  16 ++--
 drivers/gpu/drm/i915/gt/intel_lrc.c                |   6 +-
 drivers/gpu/drm/i915/i915_active.c                 |  99 +++++++++++++------
 drivers/gpu/drm/i915/i915_request.c                |  11 +++
 drivers/gpu/drm/imx/ipuv3-crtc.c                   |   2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       |   3 +-
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c        |  50 ++++++++++
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h        |   8 ++
 drivers/isdn/hardware/mISDN/hfcpci.c               |  10 +-
 drivers/mtd/nand/raw/fsl_upm.c                     |   2 +-
 drivers/mtd/nand/raw/meson_nand.c                  |   3 +-
 drivers/mtd/nand/raw/omap_elm.c                    |  24 ++---
 drivers/mtd/nand/raw/rockchip-nand-controller.c    |  45 +++++----
 drivers/mtd/nand/spi/toshiba.c                     |   4 +-
 drivers/net/dsa/bcm_sf2.c                          |   8 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  59 +++++++-----
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c      |   6 +-
 drivers/net/ethernet/intel/ice/ice_main.c          |  18 ++++
 drivers/net/ethernet/korina.c                      |   3 +-
 .../net/ethernet/marvell/prestera/prestera_pci.c   |   3 +-
 .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c       |   4 +-
 .../mellanox/mlx5/core/en_accel/macsec_fs.c        |   1 +
 drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c  |  10 ++
 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |  20 ++--
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  | 105 ++++++++++++++++-----
 drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h |   1 +
 drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c  |  29 ++++++
 .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c  |   5 +-
 drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |  16 ++++
 drivers/net/ethernet/qlogic/qed/qed_fcoe.c         |  19 +++-
 drivers/net/ethernet/qlogic/qed/qed_fcoe.h         |  17 +++-
 drivers/net/ethernet/qlogic/qed/qed_hw.c           |  26 ++++-
 drivers/net/ethernet/qlogic/qed/qed_iscsi.c        |  19 +++-
 drivers/net/ethernet/qlogic/qed/qed_iscsi.h        |   8 +-
 drivers/net/ethernet/qlogic/qed/qed_l2.c           |  19 +++-
 drivers/net/ethernet/qlogic/qed/qed_l2.h           |  24 +++++
 drivers/net/ethernet/qlogic/qed/qed_main.c         |   6 +-
 drivers/net/ethernet/socionext/netsec.c            |  11 +++
 drivers/net/ethernet/xilinx/ll_temac_main.c        |  12 ++-
 drivers/net/ipa/ipa_table.c                        |  26 ++---
 drivers/net/tap.c                                  |   2 +-
 drivers/net/tun.c                                  |   2 +-
 drivers/net/usb/cdc_ether.c                        |  21 +++++
 drivers/net/usb/usbnet.c                           |   6 ++
 drivers/net/usb/zaurus.c                           |  21 +++++
 drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c |   6 +-
 drivers/s390/net/qeth_core.h                       |   1 -
 drivers/s390/net/qeth_core_main.c                  |   2 -
 drivers/s390/net/qeth_l2_main.c                    |   9 +-
 drivers/s390/net/qeth_l3_main.c                    |   8 +-
 drivers/s390/scsi/zfcp_fc.c                        |   6 +-
 drivers/scsi/storvsc_drv.c                         |   4 +
 fs/btrfs/block-group.c                             |  51 ++++++----
 fs/btrfs/block-group.h                             |   4 +-
 fs/btrfs/free-space-tree.c                         |  24 +++--
 fs/ceph/mds_client.c                               |   4 +-
 fs/ceph/mds_client.h                               |   5 +
 fs/ceph/super.c                                    |  10 ++
 fs/erofs/zdata.c                                   |   7 +-
 fs/exfat/balloc.c                                  |   6 +-
 fs/exfat/dir.c                                     |  36 +++----
 fs/ext2/ext2.h                                     |  12 ---
 fs/ext2/super.c                                    |  23 +----
 fs/f2fs/f2fs.h                                     |   1 -
 fs/f2fs/file.c                                     |   5 -
 fs/f2fs/node.c                                     |  14 ++-
 fs/f2fs/super.c                                    |  43 ++++++---
 fs/file.c                                          |  18 +++-
 fs/ntfs3/attrlist.c                                |   4 +-
 fs/open.c                                          |   2 +-
 fs/super.c                                         |  11 ++-
 fs/sysv/itree.c                                    |   4 +
 include/asm-generic/word-at-a-time.h               |   2 +-
 include/linux/f2fs_fs.h                            |   1 +
 include/net/inet_sock.h                            |   7 +-
 include/net/ip.h                                   |   2 +-
 include/net/route.h                                |   4 +-
 include/net/vxlan.h                                |   4 +-
 io_uring/io_uring.c                                |  23 +++--
 io_uring/timeout.c                                 |   2 +-
 kernel/bpf/cpumap.c                                |  35 ++++---
 kernel/events/core.c                               |   8 +-
 kernel/trace/bpf_trace.c                           |  17 +++-
 lib/Makefile                                       |   6 ++
 lib/debugobjects.c                                 |   9 ++
 lib/test_bitmap.c                                  |   8 +-
 mm/memcontrol.c                                    |  19 ++--
 net/bluetooth/l2cap_sock.c                         |   2 +
 net/ceph/osd_client.c                              |  20 ++--
 net/core/bpf_sk_storage.c                          |   5 +-
 net/core/rtnetlink.c                               |   8 +-
 net/core/sock.c                                    |  45 +++++----
 net/core/sock_map.c                                |   2 -
 net/dcb/dcbnl.c                                    |   2 +-
 net/dccp/ipv6.c                                    |   4 +-
 net/ipv4/inet_diag.c                               |   4 +-
 net/ipv4/ip_output.c                               |   8 +-
 net/ipv4/ip_sockglue.c                             |   2 +-
 net/ipv4/raw.c                                     |   2 +-
 net/ipv4/route.c                                   |   4 +-
 net/ipv4/tcp_ipv4.c                                |   4 +-
 net/ipv4/tcp_metrics.c                             |  70 +++++++++-----
 net/ipv6/ip6mr.c                                   |   2 +-
 net/ipv6/ping.c                                    |   2 +-
 net/ipv6/raw.c                                     |   6 +-
 net/ipv6/route.c                                   |   7 +-
 net/ipv6/tcp_ipv6.c                                |   9 +-
 net/ipv6/udp.c                                     |   4 +-
 net/l2tp/l2tp_ip6.c                                |   2 +-
 net/mptcp/sockopt.c                                |   2 +-
 net/netfilter/nft_socket.c                         |   2 +-
 net/netfilter/xt_socket.c                          |   4 +-
 net/packet/af_packet.c                             |  12 +--
 net/sched/cls_fw.c                                 |   1 -
 net/sched/cls_route.c                              |   1 -
 net/sched/cls_u32.c                                |  57 +++++++++--
 net/sched/sch_taprio.c                             |  15 ++-
 net/smc/af_smc.c                                   |   2 +-
 net/unix/af_unix.c                                 |   2 +-
 net/wireless/scan.c                                |   2 +-
 net/xdp/xsk.c                                      |   2 +-
 net/xfrm/xfrm_policy.c                             |   2 +-
 rust/bindings/bindings_helper.h                    |   1 +
 rust/kernel/allocator.rs                           |  74 ++++++++++++---
 .../tests/shell/test_uprobe_from_different_cu.sh   |   8 +-
 tools/testing/selftests/rseq/rseq.c                |  28 ++++--
 .../tc-testing/tc-tests/qdiscs/taprio.json         |  25 +++++
 162 files changed, 1576 insertions(+), 647 deletions(-)