Changes in Kconfig

4b4193256c8d3bc3a5397b5cd9494c2ad386317d - Merge branch 'next' into for-linus

Tue, 15 Dec 2020 01:27:23 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.11 merge window. List of files: /linux/net/atm/Kconfig

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 03:13:23 +0100

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/net/atm/Kconfig

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/net/atm/Kconfig

3b5d1afd1f13bcab85eaa28223ad396694f929e3 - Merge branch 'for-next' into for-linus

Mon, 03 Aug 2020 08:10:08 +0200

Merge branch 'for-next' into for-linus List of files: /linux/net/atm/Kconfig

98817a84ff1c755c347ac633ff017a623a631fad - Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Tue, 30 Jun 2020 12:07:51 +0200

Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - Fix atomicity of affinity update in the GIC driver - Don't sleep in atomic when waiting for a GICv4.1 RD to respond - Fix a couple of typos in user-visible messages List of files: /linux/net/atm/Kconfig

77346a704c913268a2dad68d59523fd85dc74088 - Merge tag 'v5.8-rc3' into arm/qcom

Tue, 30 Jun 2020 11:32:02 +0200

Merge tag 'v5.8-rc3' into arm/qcomLinux 5.8-rc3 List of files: /linux/net/atm/Kconfig

60e9eabf41fa916d2ef68c5bf929197975917578 - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 29 Jun 2020 12:15:51 +0200

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextSome conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.Signed-off-by: Maarten Lankhorst List of files: /linux/net/atm/Kconfig

0f69403d2535ffc7200a8414cf3ca66a49b0d741 - Merge drm/drm-next into drm-intel-next-queued

Thu, 25 Jun 2020 17:05:03 +0200

Merge drm/drm-next into drm-intel-next-queuedCatch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap lockingAPI: convert mmap_sem comments").Signed-off-by: Jani Nikula List of files: /linux/net/atm/Kconfig

08a7c7772b4db0be06e3b27239147c0a36e2a507 - Merge remote-tracking branch 'torvalds/master' into perf/urgent

Wed, 17 Jun 2020 18:20:14 +0200

Merge remote-tracking branch 'torvalds/master' into perf/urgentTo get some newer headers that got out of sync with the copies in tools/so that we can try to have the tools/perf/ build clean for v5.8 withfewer pull requests.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/net/atm/Kconfig

6870112c46c867f50cd27570860a05bd82614b5c - Merge tag 'v5.8-rc1' into regulator-5.8

Wed, 17 Jun 2020 13:39:12 +0200

Merge tag 'v5.8-rc1' into regulator-5.8Linux 5.8-rc1 List of files: /linux/net/atm/Kconfig

07c7b547a79605f1041d55b84d91a4a4d9c5b363 - Merge tag 'v5.8-rc1' into fixes

Tue, 16 Jun 2020 18:25:03 +0200

Merge tag 'v5.8-rc1' into fixesLinux 5.8-rc1 List of files: /linux/net/atm/Kconfig

4b3c1f1b15f576445c221cbc77a88540433a2ba7 - Merge v5.8-rc1 into drm-misc-fixes

Tue, 16 Jun 2020 13:31:47 +0200

Merge v5.8-rc1 into drm-misc-fixesBeginning a new release cycles for what will become v5.8. Updatingdrm-misc-fixes accordingly.Signed-off-by: Thomas Zimmermann List of files: /linux/net/atm/Kconfig

6adc19fd13f11883c44df67b551cf8201e6bba1d - Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Sat, 13 Jun 2020 22:29:16 +0200

Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help'* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues List of files: /linux/net/atm/Kconfig

a7f7f6248d9740d710fd6bd190293fe5e16410ac - treewide: replace '---help---' in Kconfig files with 'help'

Sat, 13 Jun 2020 18:50:22 +0200

treewide: replace '---help---' in Kconfig files with 'help'Since commit 84af7a6194e4 ("checkpatch: kconfig: prefer 'help' over'---help---'"), the number of '---help---' has been graduallydecreasing, but there are still more than 2400 instances.This commit finishes the conversion. While I touched the lines,I also fixed the indentation.There are a variety of indentation styles found. a) 4 spaces + '---help---' b) 7 spaces + '---help---' c) 8 spaces + '---help---' d) 1 space + 1 tab + '---help---' e) 1 tab + '---help---' (correct indentation) f) 1 tab + 1 space + '---help---' g) 1 tab + 2 spaces + '---help---'In order to convert all of them to 1 tab + 'help', I ran thefollowing commend: $ find . -name 'Kconfig*' | xargs sed -i 's/^[[:space:]]*---help---/\thelp/'Signed-off-by: Masahiro Yamada List of files: /linux/net/atm/Kconfig

8440d4a75d90556cfb8fb3e244443f67381aafd6 - Merge branch 'dt/schema-cleanups' into dt/linus

Fri, 12 Jun 2020 17:57:00 +0200

Merge branch 'dt/schema-cleanups' into dt/linus List of files: /linux/net/atm/Kconfig

f77d26a9fc525286bcef3d4f98b52e17482cf49c - Merge branch 'x86/entry' into ras/core

Thu, 11 Jun 2020 15:17:57 +0200

Merge branch 'x86/entry' into ras/coreto fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific followup patches can be applied without creating a horrible merge conflictafterwards. List of files: /linux/net/atm/Kconfig

cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Thu, 04 Jun 2020 01:27:18 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextPull networking updates from David Miller: 1) Allow setting bluetooth L2CAP modes via socket option, from Luiz Augusto von Dentz. 2) Add GSO partial support to igc, from Sasha Neftin. 3) Several cleanups and improvements to r8169 from Heiner Kallweit. 4) Add IF_OPER_TESTING link state and use it when ethtool triggers a device self-test. From Andrew Lunn. 5) Start moving away from custom driver versions, use the globally defined kernel version instead, from Leon Romanovsky. 6) Support GRO vis gro_cells in DSA layer, from Alexander Lobakin. 7) Allow hard IRQ deferral during NAPI, from Eric Dumazet. 8) Add sriov and vf support to hinic, from Luo bin. 9) Support Media Redundancy Protocol (MRP) in the bridging code, from Horatiu Vultur.10) Support netmap in the nft_nat code, from Pablo Neira Ayuso.11) Allow UDPv6 encapsulation of ESP in the ipsec code, from Sabrina Dubroca. Also add ipv6 support for espintcp.12) Lots of ReST conversions of the networking documentation, from Mauro Carvalho Chehab.13) Support configuration of ethtool rxnfc flows in bcmgenet driver, from Doug Berger.14) Allow to dump cgroup id and filter by it in inet_diag code, from Dmitry Yakunin.15) Add infrastructure to export netlink attribute policies to userspace, from Johannes Berg.16) Several optimizations to sch_fq scheduler, from Eric Dumazet.17) Fallback to the default qdisc if qdisc init fails because otherwise a packet scheduler init failure will make a device inoperative. From Jesper Dangaard Brouer.18) Several RISCV bpf jit optimizations, from Luke Nelson.19) Correct the return type of the ->ndo_start_xmit() method in several drivers, it's netdev_tx_t but many drivers were using 'int'. From Yunjian Wang.20) Add an ethtool interface for PHY master/slave config, from Oleksij Rempel.21) Add BPF iterators, from Yonghang Song.22) Add cable test infrastructure, including ethool interfaces, from Andrew Lunn. Marvell PHY driver is the first to support this facility.23) Remove zero-length arrays all over, from Gustavo A. R. Silva.24) Calculate and maintain an explicit frame size in XDP, from Jesper Dangaard Brouer.25) Add CAP_BPF, from Alexei Starovoitov.26) Support terse dumps in the packet scheduler, from Vlad Buslov.27) Support XDP_TX bulking in dpaa2 driver, from Ioana Ciornei.28) Add devm_register_netdev(), from Bartosz Golaszewski.29) Minimize qdisc resets, from Cong Wang.30) Get rid of kernel_getsockopt and kernel_setsockopt in order to eliminate set_fs/get_fs calls. From Christoph Hellwig.* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2517 commits) selftests: net: ip_defrag: ignore EPERM net_failover: fixed rollback in net_failover_open() Revert "tipc: Fix potential tipc_aead refcnt leak in tipc_crypto_rcv" Revert "tipc: Fix potential tipc_node refcnt leak in tipc_rcv" vmxnet3: allow rx flow hash ops only when rss is enabled hinic: add set_channels ethtool_ops support selftests/bpf: Add a default $(CXX) value tools/bpf: Don't use $(COMPILE.c) bpf, selftests: Use bpf_probe_read_kernel s390/bpf: Use bcr 0,%0 as tail call nop filler s390/bpf: Maintain 8-byte stack alignment selftests/bpf: Fix verifier test selftests/bpf: Fix sample_cnt shared between two threads bpf, selftests: Adapt cls_redirect to call csum_level helper bpf: Add csum_level helper for fixing up csum levels bpf: Fix up bpf_skb_adjust_room helper's skb csum setting sfc: add missing annotation for efx_ef10_try_update_nic_stats_vf() crypto/chtls: IPv6 support for inline TLS Crypto/chcr: Fixes a coccinile check error Crypto/chcr: Fixes compilations warnings ... List of files: /linux/net/atm/Kconfig

c76c2230160d90b7bd814c0a5f2bfc657f7e0984 - Merge branch 'net-ReST-convert'

Tue, 28 Apr 2020 23:40:29 +0200

Merge branch 'net-ReST-convert'Mauro Carvalho Chehab says:====================net: manually convert files to ReST format - part 1There are very few documents upstream that aren't converted upstream.This series convert part of the networking text files into ReST.It is part of a bigger set of patches, which were split on parts,in order to make reviewing task easier.The full series (including those ones) are at: https://git.linuxtv.org/mchehab/experimental.git/log/?h=net-docsAnd the documents, converted to HTML via the building systemare at: https://www.infradead.org/~mchehab/kernel_docs/networking/====================Signed-off-by: David S. Miller List of files: /linux/net/atm/Kconfig

ff2269f16a1e1a7f8bbe72920d3d285ba3943572 - docs: networking: convert atm.txt to ReST

Tue, 28 Apr 2020 00:01:21 +0200

docs: networking: convert atm.txt to ReSTThere isn't much to be done here. Just:- add SPDX header;- add a document title.Signed-off-by: Mauro Carvalho Chehab Signed-off-by: David S. Miller List of files: /linux/net/atm/Kconfig

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/net/atm/Kconfig