Changes in Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/drivers/net/ethernet/adi/Makefile

e291c116f60f3c1ca98090f0f8e7c77e658562fb - Merge branch 'next' into for-linus

Mon, 12 Dec 2022 19:47:03 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.2 merge window. List of files: /linux/drivers/net/ethernet/adi/Makefile

29583dfcd2dd72c766422bd05c16f06c6b1fb356 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 21 Nov 2022 09:03:13 +0100

Merge drm/drm-next into drm-misc-next-fixesBackmerging to update drm-misc-next-fixes for the final phaseof the release cycle.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/net/ethernet/adi/Makefile

002c6ca75289a4ac4f6738213dd2d258704886e4 - Merge drm/drm-next into drm-intel-next

Mon, 14 Nov 2022 20:32:34 +0100

Merge drm/drm-next into drm-intel-nextCatch up on 6.1-rc cycle in order to solve the intel_backlightconflict on linux-next.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/net/ethernet/adi/Makefile

d93618da6b6d453c6a9684a3460ffd51b9b4ef2e - Merge drm/drm-next into drm-intel-gt-next

Fri, 04 Nov 2022 10:11:30 +0100

Merge drm/drm-next into drm-intel-gt-nextNeeded to bring in v6.1-rc1 which contains commit f683b9d61319 ("i915: use the VMA iterator")which is needed for series https://patchwork.freedesktop.org/series/110083/ .Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/net/ethernet/adi/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/drivers/net/ethernet/adi/Makefile

1aca5ce036e3499336d1a2ace3070f908381c055 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 20 Oct 2022 09:09:00 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get v6.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/net/ethernet/adi/Makefile

008f05a72d32dcc14038801649ec67af765fcc3c - ASoC: jz4752b: Capture fixes

Wed, 19 Oct 2022 17:37:01 +0200

ASoC: jz4752b: Capture fixesMerge series from Siarhei Volkau :The patchset fixes: - Line In path stays powered off during capturing or bypass to mixer. - incorrectly represented dB values in alsamixer, et al. - incorrect represented Capture input selector in alsamixer in Playback tab. - wrong control selected as Capture Master List of files: /linux/drivers/net/ethernet/adi/Makefile

a140a6a2d5ec0329ad05cd3532a91ad0ce58dceb - Merge drm/drm-next into drm-misc-next

Tue, 18 Oct 2022 15:00:03 +0200

Merge drm/drm-next into drm-misc-nextLet's kick-off this release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/ethernet/adi/Makefile

c29a017f9df34d190fbc7917d30dbefce7d9dc1f - Merge tag 'v6.1-rc1' into next

Mon, 17 Oct 2022 11:36:32 +0200

Merge tag 'v6.1-rc1' into nextMerge with mainline to bring in the latest changes to twl4030 driver. List of files: /linux/drivers/net/ethernet/adi/Makefile

8048b8358031ae742c1c8f16f196f6d8070bb09f - Merge branch 'master' into mm-hotfixes-stable

Mon, 17 Oct 2022 01:09:11 +0200

Merge branch 'master' into mm-hotfixes-stable List of files: /linux/drivers/net/ethernet/adi/Makefile

0326074ff4652329f2a1a9c8685104576bd8d131 - Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Tue, 04 Oct 2022 22:38:03 +0200

Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextPull networking updates from Jakub Kicinski: "Core: - Introduce and use a single page frag cache for allocating small skb heads, clawing back the 10-20% performance regression in UDP flood test from previous fixes. - Run packets which already went thru HW coalescing thru SW GRO. This significantly improves TCP segment coalescing and simplifies deployments as different workloads benefit from HW or SW GRO. - Shrink the size of the base zero-copy send structure. - Move TCP init under a new slow / sleepable version of DO_ONCE(). BPF: - Add BPF-specific, any-context-safe memory allocator. - Add helpers/kfuncs for PKCS#7 signature verification from BPF programs. - Define a new map type and related helpers for user space -> kernel communication over a ring buffer (BPF_MAP_TYPE_USER_RINGBUF). - Allow targeting BPF iterators to loop through resources of one task/thread. - Add ability to call selected destructive functions. Expose crash_kexec() to allow BPF to trigger a kernel dump. Use CAP_SYS_BOOT check on the loading process to judge permissions. - Enable BPF to collect custom hierarchical cgroup stats efficiently by integrating with the rstat framework. - Support struct arguments for trampoline based programs. Only structs with size <= 16B and x86 are supported. - Invoke cgroup/connect{4,6} programs for unprivileged ICMP ping sockets (instead of just TCP and UDP sockets). - Add a helper for accessing CLOCK_TAI for time sensitive network related programs. - Support accessing network tunnel metadata's flags. - Make TCP SYN ACK RTO tunable by BPF programs with TCP Fast Open. - Add support for writing to Netfilter's nf_conn:mark. Protocols: - WiFi: more Extremely High Throughput (EHT) and Multi-Link Operation (MLO) work (802.11be, WiFi 7). - vsock: improve support for SO_RCVLOWAT. - SMC: support SO_REUSEPORT. - Netlink: define and document how to use netlink in a "modern" way. Support reporting missing attributes via extended ACK. - IPSec: support collect metadata mode for xfrm interfaces. - TCPv6: send consistent autoflowlabel in SYN_RECV state and RST packets. - TCP: introduce optional per-netns connection hash table to allow better isolation between namespaces (opt-in, at the cost of memory and cache pressure). - MPTCP: support TCP_FASTOPEN_CONNECT. - Add NEXT-C-SID support in Segment Routing (SRv6) End behavior. - Adjust IP_UNICAST_IF sockopt behavior for connected UDP sockets. - Open vSwitch: - Allow specifying ifindex of new interfaces. - Allow conntrack and metering in non-initial user namespace. - TLS: support the Korean ARIA-GCM crypto algorithm. - Remove DECnet support. Driver API: - Allow selecting the conduit interface used by each port in DSA switches, at runtime. - Ethernet Power Sourcing Equipment and Power Device support. - Add tc-taprio support for queueMaxSDU parameter, i.e. setting per traffic class max frame size for time-based packet schedules. - Support PHY rate matching - adapting between differing host-side and link-side speeds. - Introduce QUSGMII PHY mode and 1000BASE-KX interface mode. - Validate OF (device tree) nodes for DSA shared ports; make phylink-related properties mandatory on DSA and CPU ports. Enforcing more uniformity should allow transitioning to phylink. - Require that flash component name used during update matches one of the components for which version is reported by info_get(). - Remove "weight" argument from driver-facing NAPI API as much as possible. It's one of those magic knobs which seemed like a good idea at the time but is too indirect to use in practice. - Support offload of TLS connections with 256 bit keys. New hardware / drivers: - Ethernet: - Microchip KSZ9896 6-port Gigabit Ethernet Switch - Renesas Ethernet AVB (EtherAVB-IF) Gen4 SoCs - Analog Devices ADIN1110 and ADIN2111 industrial single pair Ethernet (10BASE-T1L) MAC+PHY. - Rockchip RV1126 Gigabit Ethernet (a version of stmmac IP). - Ethernet SFPs / modules: - RollBall / Hilink / Turris 10G copper SFPs - HALNy GPON module - WiFi: - CYW43439 SDIO chipset (brcmfmac) - CYW89459 PCIe chipset (brcmfmac) - BCM4378 on Apple platforms (brcmfmac) Drivers: - CAN: - gs_usb: HW timestamp support - Ethernet PHYs: - lan8814: cable diagnostics - Ethernet NICs: - Intel (100G): - implement control of FCS/CRC stripping - port splitting via devlink - L2TPv3 filtering offload - nVidia/Mellanox: - tunnel offload for sub-functions - MACSec offload, w/ Extended packet number and replay window offload - significantly restructure, and optimize the AF_XDP support, align the behavior with other vendors - Huawei: - configuring DSCP map for traffic class selection - querying standard FEC statistics - querying SerDes lane number via ethtool - Marvell/Cavium: - egress priority flow control - MACSec offload - AMD/SolarFlare: - PTP over IPv6 and raw Ethernet - small / embedded: - ax88772: convert to phylink (to support SFP cages) - altera: tse: convert to phylink - ftgmac100: support fixed link - enetc: standard Ethtool counters - macb: ZynqMP SGMII dynamic configuration support - tsnep: support multi-queue and use page pool - lan743x: Rx IP & TCP checksum offload - igc: add xdp frags support to ndo_xdp_xmit - Ethernet high-speed switches: - Marvell (prestera): - support SPAN port features (traffic mirroring) - nexthop object offloading - Microchip (sparx5): - multicast forwarding offload - QoS queuing offload (tc-mqprio, tc-tbf, tc-ets) - Ethernet embedded switches: - Marvell (mv88e6xxx): - support RGMII cmode - NXP (felix): - standardized ethtool counters - Microchip (lan966x): - QoS queuing offload (tc-mqprio, tc-tbf, tc-cbs, tc-ets) - traffic policing and mirroring - link aggregation / bonding offload - QUSGMII PHY mode support - Qualcomm 802.11ax WiFi (ath11k): - cold boot calibration support on WCN6750 - support to connect to a non-transmit MBSSID AP profile - enable remain-on-channel support on WCN6750 - Wake-on-WLAN support for WCN6750 - support to provide transmit power from firmware via nl80211 - support to get power save duration for each client - spectral scan support for 160 MHz - MediaTek WiFi (mt76): - WiFi-to-Ethernet bridging offload for MT7986 chips - RealTek WiFi (rtw89): - P2P support"* tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1864 commits) eth: pse: add missing static inlines once: rename _SLOW to _SLEEPABLE net: pse-pd: add regulator based PSE driver dt-bindings: net: pse-dt: add bindings for regulator based PoDL PSE controller ethtool: add interface to interact with Ethernet Power Equipment net: mdiobus: search for PSE nodes by parsing PHY nodes. net: mdiobus: fwnode_mdiobus_register_phy() rework error handling net: add framework to support Ethernet PSE and PDs devices dt-bindings: net: phy: add PoDL PSE property net: marvell: prestera: Propagate nh state from hw to kernel net: marvell: prestera: Add neighbour cache accounting net: marvell: prestera: add stub handler neighbour events net: marvell: prestera: Add heplers to interact with fib_notifier_info net: marvell: prestera: Add length macros for prestera_ip_addr net: marvell: prestera: add delayed wq and flush wq on deinit net: marvell: prestera: Add strict cleanup of fib arbiter net: marvell: prestera: Add cleanup of allocated fib_nodes net: marvell: prestera: Add router nexthops ABI eth: octeon: fix build after netif_napi_add() changes net/mlx5: E-Switch, Return EBUSY if can't get mode lock ... List of files: /linux/drivers/net/ethernet/adi/Makefile

01544a272bbd1fbf1d2510e575fc494a80994948 - Merge branch 'net-ethernet-adi-add-adin1110-support'

Tue, 20 Sep 2022 15:00:32 +0200

Merge branch 'net-ethernet-adi-add-adin1110-support'Alexandru Tachici says:====================net: ethernet: adi: Add ADIN1110 supportThe ADIN1110 is a low power single port 10BASE-T1L MAC-PHYdesigned for industrial Ethernet applications. It integratesan Ethernet PHY core with a MAC and all the associated analogcircuitry, input and output clock buffering.ADIN1110 MAC-PHY encapsulates the ADIN1100 PHY. The PHY registerscan be accessed through the MDIO MAC registers.We are registering an MDIO bus with custom read/write in orderto let the PHY to be discovered by the PAL. This will letthe ADIN1100 Linux driver to probe and take control ofthe PHY.The ADIN2111 is a low power, low complexity, two-Ethernet portsswitch with integrated 10BASE-T1L PHYs and one serial peripheralinterface (SPI) port.The device is designed for industrial Ethernet applications usinglow power constrained nodes and is compliant with the IEEE 802.3cg-2019Ethernet standard for long reach 10 Mbps single pair Ethernet (SPE).The switch supports various routing configurations betweenthe two Ethernet ports and the SPI host port providing a flexiblesolution for line, daisy-chain, or ring network topologies.The ADIN2111 supports cable reach of up to 1700 meters with ultralow power consumption of 77 mW. The two PHY cores support the1.0 V p-p operating mode and the 2.4 V p-p operating mode definedin the IEEE 802.3cg standard.The device integrates the switch, two Ethernet physical layer (PHY)cores with a media access control (MAC) interface and all theassociated analog circuitry, and input and output clock buffering.The device also includes internal buffer queues, the SPI andsubsystem registers, as well as the control logic to manage the resetand clock control and hardware pin configuration.Access to the PHYs is exposed via an internal MDIO bus. Writes/readscan be performed by reading/writing to the ADIN2111 MDIO registersvia SPI.On probe, for each port, a struct net_device is allocated andregistered. When both ports are added to the same bridge, the driverwill enable offloading of frame forwarding at the hardware level.Driver offers STP support. Normal operation on forwarding state.Allows only frames with the 802.1d DA to be passed to the hostwhen in any of the other states.When both ports of ADIN2111 belong to the same SW bridge a maximumof 12 FDB entries will offloaded by the hardware and are marked as such.====================Link: https://lore.kernel.org/r/20220913122629.124546-1-andrei.tachici@stud.acs.upb.roSigned-off-by: Paolo Abeni List of files: /linux/drivers/net/ethernet/adi/Makefile

bc93e19d088bb14e116756ab270deea6ee62d782 - net: ethernet: adi: Add ADIN1110 support

Tue, 13 Sep 2022 14:26:28 +0200

net: ethernet: adi: Add ADIN1110 supportThe ADIN1110 is a low power single port 10BASE-T1L MAC-PHYdesigned for industrial Ethernet applications. It integratesan Ethernet PHY core with a MAC and all the associated analogcircuitry, input and output clock buffering.ADIN1110 MAC-PHY encapsulates the ADIN1100 PHY. The PHY registerscan be accessed through the MDIO MAC registers.We are registering an MDIO bus with custom read/write in orderto let the PHY to be discovered by the PAL. This will letthe ADIN1100 Linux driver to probe and take control ofthe PHY.The ADIN2111 is a low power, low complexity, two-Ethernet portsswitch with integrated 10BASE-T1L PHYs and one serial peripheralinterface (SPI) port.The device is designed for industrial Ethernet applications usinglow power constrained nodes and is compliant with the IEEE 802.3cg-2019Ethernet standard for long reach 10 Mbps single pair Ethernet (SPE).The switch supports various routing configurations betweenthe two Ethernet ports and the SPI host port providing a flexiblesolution for line, daisy-chain, or ring network topologies.The ADIN2111 supports cable reach of up to 1700 meters with ultralow power consumption of 77 mW. The two PHY cores support the1.0 V p-p operating mode and the 2.4 V p-p operating mode definedin the IEEE 802.3cg standard.The device integrates the switch, two Ethernet physical layer (PHY)cores with a media access control (MAC) interface and all theassociated analog circuitry, and input and output clock buffering.The device also includes internal buffer queues, the SPI andsubsystem registers, as well as the control logic to manage the resetand clock control and hardware pin configuration.Access to the PHYs is exposed via an internal MDIO bus. Writes/readscan be performed by reading/writing to the ADIN2111 MDIO registersvia SPI.On probe, for each port, a struct net_device is allocated andregistered. When both ports are added to the same bridge, the driverwill enable offloading of frame forwarding at the hardware level.Driver offers STP support. Normal operation on forwarding state.Allows only frames with the 802.1d DA to be passed to the hostwhen in any of the other states.When both ports of ADIN2111 belong to the same SW bridge a maximumof 12 FDB entries will offloaded by the hardware and are marked as such.Co-developed-by: Lennart Franzen Signed-off-by: Lennart Franzen Signed-off-by: Alexandru Tachici Signed-off-by: Paolo Abeni List of files: /linux/drivers/net/ethernet/adi/Makefile

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/net/ethernet/adi/Makefile

da733563be5a9da26fe81d9f007262d00b846e22 - Merge branch 'next' into for-linus

Mon, 09 Jan 2012 08:38:23 +0100

Merge branch 'next' into for-linus List of files: /linux/drivers/net/ethernet/adi/Makefile

251f39fe42dae863bd24e30864e6b66076ba076d - Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

Wed, 04 Jan 2012 06:09:35 +0100

Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen List of files: /linux/drivers/net/ethernet/adi/Makefile

e4da3fbfbd1de56d2367653e3823e6445e49f8a9 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next

Thu, 01 Dec 2011 11:14:48 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next List of files: /linux/drivers/net/ethernet/adi/Makefile

0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 - Merge commit 'v3.2-rc3' into next

Tue, 29 Nov 2011 10:51:07 +0100

Merge commit 'v3.2-rc3' into next List of files: /linux/drivers/net/ethernet/adi/Makefile

d4bbf7e7759afc172e2bfbc5c416324590049cdd - Merge branch 'master' into x86/memblock

Mon, 28 Nov 2011 18:46:22 +0100

Merge branch 'master' into x86/memblockConflicts & resolutions:* arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().* drivers/pci/intel-iommu.c 166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.* mm/Kconfig 6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.* mm/memblock.c d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial.Signed-off-by: Tejun Heo List of files: /linux/drivers/net/ethernet/adi/Makefile