This is a note to let you know that I've just added the patch titled
act_mirred: remove unneded merge conflict markers
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
act_mirred-remove-unneded-merge-conflict-markers.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed Jun 28 07:56:26 AM CEST 2023
Date: Wed, 28 Jun 2023 07:56:26 +0200
To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Subject: act_mirred: remove unneded merge conflict markers
In commit 169a41073993 ("act_mirred: use the backlog for nested calls to mirred
ingress"), a merge conflict marker snuck in, so remove it.
Reported-by: Bart Van Assche <bvanassche@xxxxxxxxxx>
Fixes: 169a41073993 ("act_mirred: use the backlog for nested calls to mirred ingress")
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/forwarding/tc_actions.sh | 1 -
1 file changed, 1 deletion(-)
--- a/tools/testing/selftests/net/forwarding/tc_actions.sh
+++ b/tools/testing/selftests/net/forwarding/tc_actions.sh
@@ -199,7 +199,6 @@ mirred_egress_to_ingress_tcp_test()
log_test "mirred_egress_to_ingress_tcp ($tcflags)"
}
->>>>>>> e921d05033293 (act_mirred: use the backlog for nested calls to mirred ingress)
setup_prepare()
{
h1=${NETIFS[p1]}
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.15/nilfs2-prevent-general-protection-fault-in-nilfs_clear_dirty_page.patch
queue-5.15/drivers-hv-vmbus-fix-vmbus_wait_for_unload-to-scan-present-cpus.patch
queue-5.15/selftests-mptcp-lib-skip-if-not-below-kernel-version.patch
queue-5.15/act_mirred-remove-unneded-merge-conflict-markers.patch
queue-5.15/usb-gadget-udc-fix-null-dereference-in-remove.patch
queue-5.15/drm-amd-display-add-wrapper-to-call-planes-and-stream-update.patch
queue-5.15/pci-hv-add-a-per-bus-mutex-state_lock.patch
queue-5.15/ip_tunnels-allow-vxlan-geneve-to-inherit-tos-ttl-from-vlan.patch
queue-5.15/tracing-add-tracing_reset_all_online_cpus_unlocked-function.patch
queue-5.15/x86-mm-avoid-using-set_pgd-outside-of-real-pgd-pages.patch
queue-5.15/pci-hv-fix-a-race-condition-in-hv_irq_unmask-that-can-cause-panic.patch
queue-5.15/io_uring-net-clear-msg_controllen-on-partial-sendmsg-retry.patch
queue-5.15/selftests-mptcp-join-use-iptables-legacy-if-available.patch
queue-5.15/io_uring-net-disable-partial-retries-for-recvmsg-with-cmsg.patch
queue-5.15/revert-pci-hv-fix-a-timing-issue-which-causes-kdump-to-fail-occasionally.patch
queue-5.15/selftests-mount_setattr-fix-redefine-struct-mount_attr-build-error.patch
queue-5.15/nilfs2-fix-buffer-corruption-due-to-concurrent-device-reads.patch
queue-5.15/selftests-mptcp-lib-skip-if-missing-symbol.patch
queue-5.15/io_uring-net-save-msghdr-msg_control-for-retries.patch
queue-5.15/writeback-fix-dereferencing-null-mapping-host-on-writeback_page_template.patch
queue-5.15/drm-amd-display-use-dc_update_planes_and_stream.patch
queue-5.15/mmc-meson-gx-remove-redundant-mmc_request_done-call-from-irq-context.patch
queue-5.15/selftests-mptcp-pm-nl-remove-hardcoded-default-limits.patch
queue-5.15/selftests-mptcp-join-skip-check-if-mib-counter-not-supported.patch
queue-5.15/pci-hv-remove-the-useless-hv_pcichild_state-from-struct-hv_pci_dev.patch
queue-5.15/drivers-hv-vmbus-call-hv_synic_free-if-hv_synic_alloc-fails.patch
queue-5.15/mmc-mmci-stm32-fix-max-busy-timeout-calculation.patch
queue-5.15/pci-hv-fix-a-race-condition-bug-in-hv_pci_query_relations.patch
queue-5.15/tick-common-align-tick-period-during-sched_timer-setup.patch
queue-5.15/acpi-sleep-avoid-breaking-s3-wakeup-due-to-might_sleep.patch
queue-5.15/drm-amd-display-add-minimal-pipe-split-transition-state.patch
queue-5.15/mmc-sdhci-msm-disable-broken-64-bit-dma-on-msm8916.patch
queue-5.15/cgroup-do-not-corrupt-task-iteration-when-rebinding-subsystem.patch
queue-5.15/tpm-tpm_tis-claim-locality-in-interrupt-handler.patch
queue-5.15/kvm-avoid-illegal-stage2-mapping-on-invalid-memory-slot.patch
