== Series Details == Series: treewide: Convert del_timer*() to timer_shutdown*() URL : https://patchwork.freedesktop.org/series/112115/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/112115/revisions/1/mbox/ not applied Applying: treewide: Convert del_timer*() to timer_shutdown*() Using index info to reconstruct a base tree... M block/blk-iocost.c M block/blk-iolatency.c M drivers/acpi/apei/ghes.c M drivers/block/drbd/drbd_main.c M drivers/block/loop.c M drivers/bluetooth/hci_bcsp.c M drivers/hid/hid-wiimote-core.c M drivers/isdn/mISDN/l1oip_core.c M drivers/leds/trigger/ledtrig-pattern.c M drivers/net/ethernet/intel/i40e/i40e_main.c M drivers/net/ethernet/marvell/sky2.c M drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c M drivers/net/wireless/intel/iwlwifi/mvm/sta.c M drivers/staging/wlan-ng/prism2usb.c M drivers/tty/n_gsm.c M fs/ext4/super.c M net/802/garp.c M net/802/mrp.c M net/bridge/br_multicast.c M net/ipv4/ipmr.c M net/ipv6/ip6mr.c M net/sched/cls_flow.c M net/sunrpc/svc.c Falling back to patching base and 3-way merge... Auto-merging net/sunrpc/svc.c Auto-merging net/sched/cls_flow.c Auto-merging net/ipv6/ip6mr.c Auto-merging net/ipv4/ipmr.c Auto-merging net/bridge/br_multicast.c Auto-merging net/802/mrp.c Auto-merging net/802/garp.c Auto-merging fs/ext4/super.c Auto-merging drivers/tty/n_gsm.c Auto-merging drivers/staging/wlan-ng/prism2usb.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2usb.c Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c Auto-merging drivers/net/ethernet/marvell/sky2.c Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c Auto-merging drivers/leds/trigger/ledtrig-pattern.c Auto-merging drivers/isdn/mISDN/l1oip_core.c Auto-merging drivers/hid/hid-wiimote-core.c Auto-merging drivers/bluetooth/hci_bcsp.c Auto-merging drivers/block/loop.c Auto-merging drivers/block/drbd/drbd_main.c Auto-merging drivers/acpi/apei/ghes.c Auto-merging block/blk-iolatency.c Auto-merging block/blk-iocost.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 treewide: Convert del_timer*() to timer_shutdown*() When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
