diff mbox series

[5.4,62/62] Revert "net: micrel: fix KS8851_MLL Kconfig"

Message ID	20220426081738.999369794@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Marek Vasut <marex@denx.de>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Randy Dunlap <rdunlap@infradead.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 62/62] Revert "net: micrel: fix KS8851_MLL Kconfig" Date: Tue, 26 Apr 2022 10:21:42 +0200 Message-Id: <20220426081738.999369794@linuxfoundation.org> In-Reply-To: <20220426081737.209637816@linuxfoundation.org> References: <20220426081737.209637816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/62] mm: page_alloc: fix building error on -Werror=array-compare [5.4,03/62] tracing: Dump stacktrace trigger to the corresponding instance [5.4,04/62] can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path [5.4,05/62] gfs2: assign rgrp glock before compute_bitstructs [5.4,06/62] tcp: fix race condition when creating child sockets from syncookies [5.4,07/62] net/sched: cls_u32: fix netns refcount changes in u32_change() [5.4,08/62] tcp: Fix potential use-after-free due to double kfree() [5.4,09/62] ALSA: usb-audio: Clear MIDI port active flag after draining [5.4,10/62] ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek [5.4,11/62] ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component [5.4,12/62] dmaengine: imx-sdma: Fix error checking in sdma_event_remap [5.4,13/62] dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources [5.4,14/62] igc: Fix infinite loop in release_swfw_sync [5.4,15/62] igc: Fix BUG: scheduling while atomic [5.4,16/62] rxrpc: Restore removed timer deletion [5.4,17/62] net/smc: Fix sock leak when release after smc_shutdown() [5.4,18/62] net/packet: fix packet_sock xmit return value checking [5.4,19/62] net/sched: cls_u32: fix possible leak in u32_init_knode() [5.4,20/62] l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_... [5.4,21/62] netlink: reset network and mac headers in netlink_dump() [5.4,22/62] selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets [5.4,23/62] ARM: vexpress/spc: Avoid negative array index when !SMP [5.4,24/62] reset: tegra-bpmp: Restore Handle errors in BPMP response [5.4,25/62] platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative [5.4,26/62] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant [5.4,27/62] vxlan: fix error return code in vxlan_fdb_append [5.4,28/62] cifs: Check the IOCB_DIRECT flag, not O_DIRECT [5.4,29/62] mt76: Fix undefined behavior due to shift overflowing the constant [5.4,30/62] brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant [5.4,31/62] dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info() [5.4,32/62] drm/msm/mdp5: check the return of kzalloc() [5.4,33/62] net: macb: Restart tx only if queue pointer is lagging [5.4,34/62] scsi: qedi: Fix failed disconnect handling [5.4,35/62] stat: fix inconsistency between struct stat and struct compat_stat [5.4,36/62] EDAC/synopsys: Read the error count from the correct register [5.4,37/62] oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup [5.4,38/62] ata: pata_marvell: Check the bmdma_addr beforing reading [5.4,39/62] dma: at_xdmac: fix a missing check on list iterator [5.4,40/62] drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised [5.4,41/62] drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare [5.4,42/62] KVM: PPC: Fix TCE handling for VFIO [5.4,43/62] drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage [5.4,44/62] powerpc/perf: Fix power9 event alternatives [5.4,45/62] xtensa: patch_text: Fixup last cpu should be master [5.4,46/62] xtensa: fix a7 clobbering in coprocessor context load/store [5.4,47/62] openvswitch: fix OOB access in reserve_sfa_size() [5.4,48/62] ASoC: soc-dapm: fix two incorrect uses of list iterator [5.4,49/62] e1000e: Fix possible overflow in LTR decoding [5.4,50/62] ARC: entry: fix syscall_trace_exit argument [5.4,51/62] arm_pmu: Validate single/group leader events [5.4,52/62] ext4: fix symlink file size not match to file content [5.4,53/62] ext4: fix use-after-free in ext4_search_dir [5.4,54/62] ext4: limit length to bitmap_maxbytes - blocksize in punch_hole [5.4,55/62] ext4, doc: fix incorrect h_reserved size [5.4,56/62] ext4: fix overhead calculation to account for the reserved gdt blocks [5.4,57/62] ext4: force overhead calculation if the s_overhead_cluster makes no sense [5.4,58/62] jbd2: fix a potential race while discarding reserved buffers after an abort [5.4,59/62] spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller [5.4,60/62] staging: ion: Prevent incorrect reference counting behavour [5.4,61/62] block/compat_ioctl: fix range check in BLKGETSIZE [5.4,62/62] Revert "net: micrel: fix KS8851_MLL Kconfig"

Commit Message

Greg KH April 26, 2022, 8:21 a.m. UTC

From: Marek Vasut <marex@denx.de>

This reverts commit 4cd3c9e070d6a9a9dc76a5ffa79114953bf69087 which is
commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig")
depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
which is not part of Linux 5.4.y . Revert the aforementioned commit to
prevent breakage in 5.4.y .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/micrel/Kconfig |    1 -
 1 file changed, 1 deletion(-)

diff mbox series

Patch

--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -37,7 +37,6 @@  config KS8851
 config KS8851_MLL
 	tristate "Micrel KS8851 MLL"
 	depends on HAS_IOMEM
-	depends on PTP_1588_CLOCK_OPTIONAL
 	select MII
 	---help---
 	  This platform driver is for Micrel KS8851 Address/data bus