diff mbox series

[4.14,43/43] Revert "net: micrel: fix KS8851_MLL Kconfig"

Message ID	20220426081735.792458579@linuxfoundation.org
State	New
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 4.14 43/43] Revert "net: micrel: fix KS8851_MLL Kconfig" Date: Tue, 26 Apr 2022 10:21:25 +0200 Message-Id: <20220426081735.792458579@linuxfoundation.org> In-Reply-To: <20220426081734.509314186@linuxfoundation.org> References: <20220426081734.509314186@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 [4.14,02/43] mm: page_alloc: fix building error on -Werror=array-compare [4.14,03/43] tracing: Have traceon and traceoff trigger honor the instance [4.14,04/43] tracing: Dump stacktrace trigger to the corresponding instance [4.14,05/43] can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path [4.14,06/43] gfs2: assign rgrp glock before compute_bitstructs [4.14,07/43] ALSA: usb-audio: Clear MIDI port active flag after draining [4.14,08/43] tcp: fix race condition when creating child sockets from syncookies [4.14,09/43] tcp: Fix potential use-after-free due to double kfree() [4.14,10/43] dmaengine: imx-sdma: Fix error checking in sdma_event_remap [4.14,11/43] net/packet: fix packet_sock xmit return value checking [4.14,12/43] netlink: reset network and mac headers in netlink_dump() [4.14,13/43] ARM: vexpress/spc: Avoid negative array index when !SMP [4.14,14/43] platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative [4.14,15/43] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant [4.14,16/43] vxlan: fix error return code in vxlan_fdb_append [4.14,17/43] cifs: Check the IOCB_DIRECT flag, not O_DIRECT [4.14,18/43] brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant [4.14,19/43] drm/msm/mdp5: check the return of kzalloc() [4.14,20/43] net: macb: Restart tx only if queue pointer is lagging [4.14,21/43] stat: fix inconsistency between struct stat and struct compat_stat [4.14,22/43] ata: pata_marvell: Check the bmdma_addr beforing reading [4.14,23/43] dma: at_xdmac: fix a missing check on list iterator [4.14,24/43] powerpc/perf: Fix power9 event alternatives [4.14,25/43] openvswitch: fix OOB access in reserve_sfa_size() [4.14,26/43] ASoC: soc-dapm: fix two incorrect uses of list iterator [4.14,27/43] e1000e: Fix possible overflow in LTR decoding [4.14,28/43] ARC: entry: fix syscall_trace_exit argument [4.14,29/43] ext4: fix symlink file size not match to file content [4.14,30/43] ext4: limit length to bitmap_maxbytes - blocksize in punch_hole [4.14,31/43] ext4: fix overhead calculation to account for the reserved gdt blocks [4.14,32/43] ext4: force overhead calculation if the s_overhead_cluster makes no sense [4.14,33/43] staging: ion: Prevent incorrect reference counting behavour [4.14,34/43] block/compat_ioctl: fix range check in BLKGETSIZE [4.14,35/43] ax25: add refcount in ax25_dev to avoid UAF bugs [4.14,36/43] ax25: fix reference count leaks of ax25_dev [4.14,37/43] ax25: fix UAF bugs of net_device caused by rebinding operation [4.14,38/43] ax25: Fix refcount leaks caused by ax25_cb_del() [4.14,39/43] ax25: fix UAF bug in ax25_send_control() [4.14,40/43] ax25: fix NPD bug in ax25_disconnect [4.14,41/43] ax25: Fix NULL pointer dereferences in ax25 timers [4.14,42/43] ax25: Fix UAF bugs in ax25 timers [4.14,43/43] 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 84ddee4ea320411fa038d4f1fd9a0161f989b482 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 4.14.y . Revert the aforementioned commit to
prevent breakage in 4.14.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
@@ -45,7 +45,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