Changes in Makefile

552c69b36ebd966186573b9c7a286b390935cce1 - Merge tag 'v4.17-rc3' into apparmor-next

Wed, 02 May 2018 09:38:52 +0200

Merge tag 'v4.17-rc3' into apparmor-nextLinux v4.17-rc3Merge in v4.17 for LSM updatesSigned-off-by: John Johansen List of files: /linux/drivers/net/ethernet/cortina/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

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

c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 - Merge tag 'v4.16-rc4' into next

Thu, 08 Mar 2018 20:07:30 +0100

Merge tag 'v4.16-rc4' into nextSync up with mainline to bring in RAVE MFD device core. List of files: /linux/drivers/net/ethernet/cortina/Makefile

5fe9cfbe44b6892e17f803125c4761221b0175c6 - Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Wed, 07 Mar 2018 13:57:24 +0100

Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.16-rc4 List of files: /linux/drivers/net/ethernet/cortina/Makefile

bba73071b6f71be0a101658d7c13866e30b264a6 - Merge drm-next into drm-intel-next-queued (this time for real)

Thu, 01 Mar 2018 10:14:24 +0100

Merge drm-next into drm-intel-next-queued (this time for real)To pull in the HDCP changes, especially wait_for changes to drm/i915that Chris wants to build on top of.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/net/ethernet/cortina/Makefile

a02633e9b13dcb9b1a656b08f81bc8ba2d4d2294 - Merge tag 'v4.16-rc2' into next-general

Wed, 21 Feb 2018 17:21:41 +0100

Merge tag 'v4.16-rc2' into next-generalSync to Linux 4.16-rc2 for developers to work against. List of files: /linux/drivers/net/ethernet/cortina/Makefile

862e6e2a609197f41bc04420b31ff122be9f870f - Merge tag 'v4.16-rc2' into locking/core, to refresh the branch

Wed, 21 Feb 2018 09:57:55 +0100

Merge tag 'v4.16-rc2' into locking/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/drivers/net/ethernet/cortina/Makefile

7057bb975dab827997e0ca9dd92cafef0856b0cc - Merge branch 'perf/urgent' into perf/core, to pick up fixes

Sat, 17 Feb 2018 11:39:28 +0100

Merge branch 'perf/urgent' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/net/ethernet/cortina/Makefile

d4da404f36b24b089d20db1fb27d8f99cb66f409 - Merge airlied/drm-next into drm-misc-next

Fri, 16 Feb 2018 21:47:43 +0100

Merge airlied/drm-next into drm-misc-nextBackmerge 4.15 and hdcp topic branchSigned-off-by: Sean Paul List of files: /linux/drivers/net/ethernet/cortina/Makefile

6dee6ae9d62642e81def4d461d71f13a6496ab59 - Merge tag 'irqchip-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Fri, 16 Feb 2018 15:47:26 +0100

Merge tag 'irqchip-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip updates for 4.16-rc2 from Marc Zyngier - A MIPS GIC fix for spurious, masked interrupts - A fix for a subtle IPI bug in GICv3 - Do not probe GICv3 ITSs that are marked as disabled - Multi-MSI support for GICv2m - Various cleanups List of files: /linux/drivers/net/ethernet/cortina/Makefile

191db1ceb88264eea441648a63475538c5050461 - Merge branch 'topic/component-platform' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung

Wed, 14 Feb 2018 13:03:25 +0100

Merge branch 'topic/component-platform' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung List of files: /linux/drivers/net/ethernet/cortina/Makefile

7980033bea8a74692fdb987c44ec91b0be8e752b - Merge branch 'linus' into x86/urgent, to pick up dependent commits

Sun, 11 Feb 2018 11:33:33 +0100

Merge branch 'linus' into x86/urgent, to pick up dependent commitsSigned-off-by: Ingo Molnar List of files: /linux/drivers/net/ethernet/cortina/Makefile

82845079160817cc6ac64e5321bbd935e0a47b3a - Merge branch 'linus' into sched/urgent, to resolve conflicts

Tue, 06 Feb 2018 21:12:31 +0100

Merge branch 'linus' into sched/urgent, to resolve conflicts Conflicts: arch/arm64/kernel/entry.S arch/x86/Kconfig include/linux/sched/mm.h kernel/fork.cSigned-off-by: Ingo Molnar List of files: /linux/drivers/net/ethernet/cortina/Makefile

b2fe5fa68642860e7de76167c3111623aa0d5de1 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Wed, 31 Jan 2018 23:31:10 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextPull networking updates from David Miller: 1) Significantly shrink the core networking routing structures. Result of http://vger.kernel.org/~davem/seoul2017_netdev_keynote.pdf 2) Add netdevsim driver for testing various offloads, from Jakub Kicinski. 3) Support cross-chip FDB operations in DSA, from Vivien Didelot. 4) Add a 2nd listener hash table for TCP, similar to what was done for UDP. From Martin KaFai Lau. 5) Add eBPF based queue selection to tun, from Jason Wang. 6) Lockless qdisc support, from John Fastabend. 7) SCTP stream interleave support, from Xin Long. 8) Smoother TCP receive autotuning, from Eric Dumazet. 9) Lots of erspan tunneling enhancements, from William Tu.10) Add true function call support to BPF, from Alexei Starovoitov.11) Add explicit support for GRO HW offloading, from Michael Chan.12) Support extack generation in more netlink subsystems. From Alexander Aring, Quentin Monnet, and Jakub Kicinski.13) Add 1000BaseX, flow control, and EEE support to mvneta driver. From Russell King.14) Add flow table abstraction to netfilter, from Pablo Neira Ayuso.15) Many improvements and simplifications to the NFP driver bpf JIT, from Jakub Kicinski.16) Support for ipv6 non-equal cost multipath routing, from Ido Schimmel.17) Add resource abstration to devlink, from Arkadi Sharshevsky.18) Packet scheduler classifier shared filter block support, from Jiri Pirko.19) Avoid locking in act_csum, from Davide Caratti.20) devinet_ioctl() simplifications from Al viro.21) More TCP bpf improvements from Lawrence Brakmo.22) Add support for onlink ipv6 route flag, similar to ipv4, from David Ahern.* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1925 commits) tls: Add support for encryption using async offload accelerator ip6mr: fix stale iterator net/sched: kconfig: Remove blank help texts openvswitch: meter: Use 64-bit arithmetic instead of 32-bit tcp_nv: fix potential integer overflow in tcpnv_acked r8169: fix RTL8168EP take too long to complete driver initialization. qmi_wwan: Add support for Quectel EP06 rtnetlink: enable IFLA_IF_NETNSID for RTM_NEWLINK ipmr: Fix ptrdiff_t print formatting ibmvnic: Wait for device response when changing MAC qlcnic: fix deadlock bug tcp: release sk_frag.page in tcp_disconnect ipv4: Get the address of interface correctly. net_sched: gen_estimator: fix lockdep splat net: macb: Handle HRESP error net/mlx5e: IPoIB, Fix copy-paste bug in flow steering refactoring ipv6: addrconf: break critical section in addrconf_verify_rtnl() ipv6: change route cache aging logic i40e/i40evf: Update DESC_NEEDED value to reflect larger value bnxt_en: cleanup DIM work on device shutdown ... List of files: /linux/drivers/net/ethernet/cortina/Makefile

4d5ae32f5e1e13f7f36d6439ec3257993b9f5b88 - net: ethernet: Add a driver for Gemini gigabit ethernet

Fri, 12 Jan 2018 22:34:24 +0100

net: ethernet: Add a driver for Gemini gigabit ethernetThe Gemini ethernet has been around for years as an out-of-treepatch used with the NAS boxen and routers built on StorLinkSL3512 and SL3516, later Storm Semiconductor, later CortinaSystems. These ASICs are still being deployed and brand newoff-the-shelf systems using it can easily be acquired.The full name of the IP block is "Net Engine and GigabitEthernet MAC" commonly just called "GMAC".The hardware block contains a common TCP Offload Enginer (TOE)that can be used by both MACs. The current driver does not useit.Cc: Tobias Waldvogel Signed-off-by: Michał Mirosław Signed-off-by: Linus Walleij Signed-off-by: David S. Miller List of files: /linux/drivers/net/ethernet/cortina/Makefile