Changes in Kconfig

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/drivers/net/ethernet/ni/Kconfig

d6310078d9f8c416e85f641a631aecf58f9c97ff - Merge branch 'for-5.12/google' into for-linus

Tue, 23 Feb 2021 11:33:13 +0100

Merge branch 'for-5.12/google' into for-linus- User experience improvements for hid-google from Nicolas Boichat List of files: /linux/drivers/net/ethernet/ni/Kconfig

cbecf716ca618fd44feda6bd9a64a8179d031fc5 - Merge branch 'next' into for-linus

Tue, 23 Feb 2021 06:35:15 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.12 merge window. List of files: /linux/drivers/net/ethernet/ni/Kconfig

415e915fdfc775ad0c6675fde1008f6f43dd6251 - Merge tag 'v5.11' into next

Tue, 23 Feb 2021 06:21:03 +0100

Merge tag 'v5.11' into nextMerge with mainline to get latest APIs and device tree bindings. List of files: /linux/drivers/net/ethernet/ni/Kconfig

9d4d8572a539ef807e21c196f145aa365fd52f0e - Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable

Tue, 02 Feb 2021 15:37:25 +0100

Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stableTag for adaptions to struct amba_driver::remove changing prototype List of files: /linux/drivers/net/ethernet/ni/Kconfig

715a1284d89a740b197b3bad5eb20d36a397382f - Merge branch 'cpuidle-fix' into fixes

Fri, 15 Jan 2021 11:48:43 +0100

Merge branch 'cpuidle-fix' into fixes List of files: /linux/drivers/net/ethernet/ni/Kconfig

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

Fri, 15 Jan 2021 07:49:57 +0100

Merge drm/drm-next into drm-intel-gt-nextBackmerging to get a common base for merging topic branches betweendrm-intel-next and drm-intel-gt-next.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/net/ethernet/ni/Kconfig

10205618052908770451acd33eaeaa7685e97ed2 - Merge drm/drm-next into drm-intel-next

Fri, 08 Jan 2021 12:03:51 +0100

Merge drm/drm-next into drm-intel-nextsync-up to not fall too much behind.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/net/ethernet/ni/Kconfig

6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d - Merge branch 'for-linus' into for-next

Thu, 07 Jan 2021 18:52:46 +0100

Merge branch 'for-linus' into for-nextBack-merge of 5.11-devel branch for syncing the result changes.Signed-off-by: Takashi Iwai List of files: /linux/drivers/net/ethernet/ni/Kconfig

7b62275507232f01f66d3e7d05c77bbd9009b726 - Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 07 Jan 2021 18:51:39 +0100

Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v5.11A collection of mostly driver specific fixes, plus a maintainershipupdate for TI and a fix for DAPM driver removal paths. List of files: /linux/drivers/net/ethernet/ni/Kconfig

2313f4700327fb7d6aa3989edfa5bffcd7080d36 - Merge drm/drm-next into drm-misc-next

Thu, 07 Jan 2021 14:11:28 +0100

Merge drm/drm-next into drm-misc-nextStaying in sync to drm-next, and to be able to pull ttm fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/net/ethernet/ni/Kconfig

8db90aa36063f471bea1e65e23185913043852dc - Merge tag 'v5.11-rc1' into spi-5.11

Mon, 28 Dec 2020 15:20:15 +0100

Merge tag 'v5.11-rc1' into spi-5.11Linux 5.11-rc1 List of files: /linux/drivers/net/ethernet/ni/Kconfig

2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc - Merge tag 'v5.11-rc1' into regulator-5.11

Mon, 28 Dec 2020 15:20:00 +0100

Merge tag 'v5.11-rc1' into regulator-5.11Linux 5.11-rc1 List of files: /linux/drivers/net/ethernet/ni/Kconfig

f81325a05e9317f09a2e4ec57a52e4e49eb42b54 - Merge tag 'v5.11-rc1' into asoc-5.11

Mon, 28 Dec 2020 15:16:53 +0100

Merge tag 'v5.11-rc1' into asoc-5.11Linux 5.11-rc1 List of files: /linux/drivers/net/ethernet/ni/Kconfig

d64c6f96ba86bd8b97ed8d6762a8c8cc1770d214 - Merge tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 17 Dec 2020 22:45:24 +0100

Merge tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netPull networking fixes from Jakub Kicinski: "Current release - always broken: - net/smc: fix access to parent of an ib device - devlink: use _BITUL() macro instead of BIT() in the UAPI header - handful of mptcp fixes Previous release - regressions: - intel: AF_XDP: clear the status bits for the next_to_use descriptor - dpaa2-eth: fix the size of the mapped SGT buffer Previous release - always broken: - mptcp: fix security context on server socket - ethtool: fix string set id check - ethtool: fix error paths in ethnl_set_channels() - lan743x: fix rx_napi_poll/interrupt ping-pong - qca: ar9331: fix sleeping function called from invalid context bug"* tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (32 commits) net/sched: sch_taprio: reset child qdiscs before freeing them nfp: move indirect block cleanup to flower app stop callback octeontx2-af: Fix undetected unmap PF error check net: nixge: fix spelling mistake in Kconfig: "Instuments" -> "Instruments" qlcnic: Fix error code in probe mptcp: fix pending data accounting mptcp: push pending frames when subflow has free space mptcp: properly annotate nested lock mptcp: fix security context on server socket net/mlx5: Fix compilation warning for 32-bit platform mptcp: clear use_ack and use_map when dropping other suboptions devlink: use _BITUL() macro instead of BIT() in the UAPI header net: korina: fix return value net/smc: fix access to parent of an ib device ethtool: fix error paths in ethnl_set_channels() nfc: s3fwrn5: Remove unused NCI prop commands nfc: s3fwrn5: Remove the delay for NFC sleep phy: fix kdoc warning tipc: do sanity check payload of a netlink message use __netdev_notify_peers in hyperv ... List of files: /linux/drivers/net/ethernet/ni/Kconfig

38ba95a4ed24126d36288a0c2434ced5b4c244d2 - net: nixge: fix spelling mistake in Kconfig: "Instuments" -> "Instruments"

Wed, 16 Dec 2020 13:00:20 +0100

net: nixge: fix spelling mistake in Kconfig: "Instuments" -> "Instruments"There is a spelling mistake in the Kconfig. Fix it.Signed-off-by: Colin Ian King Link: https://lore.kernel.org/r/20201216120020.13149-1-colin.king@canonical.comSigned-off-by: Jakub Kicinski List of files: /linux/drivers/net/ethernet/ni/Kconfig

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/net/ethernet/ni/Kconfig

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/net/ethernet/ni/Kconfig

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/net/ethernet/ni/Kconfig

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/ethernet/ni/Kconfig