Changes in Makefile

3eb66e91a25497065c5322b1268cbc3953642227 - Merge tag 'v4.20' into for-linus

Tue, 15 Jan 2019 00:33:23 +0100

Merge tag 'v4.20' into for-linusSync with mainline to get linux/overflow.h among other things. List of files: /linux/net/llc/Makefile

4116941b7a703f8c770998bb3a59966608cb5bb2 - Merge tag 'v4.20' into next

Mon, 14 Jan 2019 07:35:32 +0100

Merge tag 'v4.20' into nextMerge with mainline to bring in the new APIs. List of files: /linux/net/llc/Makefile

aaccf3c97418f169afdbb5855e9cbcbda34e90fd - Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Wed, 26 Sep 2018 15:54:31 +0200

Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextSync with upstream (which now contains fbdev-v4.19 changes) toprepare a base for fbdev-v4.20 changes. List of files: /linux/net/llc/Makefile

2863b00941bc3062ea3299ed4057acfd9e52c335 - Merge drm/drm-next into drm-intel-next-queued

Wed, 26 Sep 2018 10:24:04 +0200

Merge drm/drm-next into drm-intel-next-queuedCatch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENTspecifically.Signed-off-by: Jani Nikula List of files: /linux/net/llc/Makefile

9ac669fc01dbfef707ecaa6b618c0d03294cca16 - Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/core

Sat, 15 Sep 2018 20:50:42 +0200

Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/corePull more y2038 work from Arnd Bergman:y2038: convert more syscallsHere is another set of system call changes to prepare the change over to64-bit time_t. As before, the strategy is to change system calls thattake a 'struct timespec' argument over to 'struct __kernel_timespec',which for now is defined to be the same but will get redefined to use a64-bit time_t argument once we are ready to modify the system call tables.The major change from previous patches is that the plan is no longerto directly use the 'compat' system calls for providing compatibilitywith the existing 32-bit time_t based entry points. Instead, we renamethe compat code to something that makes more sense on 32-bit architectures,e.g. compat_timespec becomes old_timespec32.With the renamed types in place, change over the 'stat' and 'utimes'families of system calls, sched_rr_get_interval, recvmmsg andrt_sigtimedwait. Another series for poll, select and io_pgetevents iscurrently being tested. List of files: /linux/net/llc/Makefile

e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce - Merge tag 'v4.19-rc2' into next-general

Tue, 04 Sep 2018 20:35:54 +0200

Merge tag 'v4.19-rc2' into next-generalSync to Linux 4.19-rc2 for downstream developers. List of files: /linux/net/llc/Makefile

6e2d6b2728fcb408eabd7991804f8cb33ff59f20 - Merge tag 'v4.19-rc1' into asoc-4.19

Tue, 28 Aug 2018 20:03:57 +0200

Merge tag 'v4.19-rc1' into asoc-4.19Linux 4.19-rc1 List of files: /linux/net/llc/Makefile

ea4d65f14f6aaa53e379b93c5544245ef081b3e7 - Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

Tue, 28 Aug 2018 18:58:03 +0200

Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2 List of files: /linux/net/llc/Makefile

bc537a9cc47eec7f4e32b8164c494ddc35dca8ac - Merge drm/drm-next into drm-misc-next

Mon, 27 Aug 2018 16:00:03 +0200

Merge drm/drm-next into drm-misc-nextNow that 4.19-rc1 is cut, backmerge it into -misc-next.Signed-off-by: Sean Paul List of files: /linux/net/llc/Makefile

0a3173a5f09bc58a3638ecfd0a80bdbae55e123c - Merge branch 'linus/master' into rdma.git for-next

Thu, 16 Aug 2018 22:13:03 +0200

Merge branch 'linus/master' into rdma.git for-nextrdma.git merge resolution for the 4.19 merge windowConflicts: drivers/infiniband/core/rdma_core.c - Use the rdma code and revise with the new spelling for atomic_fetch_add_unless drivers/nvme/host/rdma.c - Replace max_sge with max_send_sge in new blk code drivers/nvme/target/rdma.c - Use the blk code and revise to use NULL for ib_post_recv when appropriate - Replace max_sge with max_recv_sge in new blk code net/rds/ib_send.c - Use the net code and revise to use NULL for ib_post_recv when appropriateSigned-off-by: Jason Gunthorpe List of files: /linux/net/llc/Makefile

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

Thu, 16 Aug 2018 00:04:25 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextPull networking updates from David Miller: "Highlights: - Gustavo A. R. Silva keeps working on the implicit switch fallthru changes. - Support 802.11ax High-Efficiency wireless in cfg80211 et al, From Luca Coelho. - Re-enable ASPM in r8169, from Kai-Heng Feng. - Add virtual XFRM interfaces, which avoids all of the limitations of existing IPSEC tunnels. From Steffen Klassert. - Convert GRO over to use a hash table, so that when we have many flows active we don't traverse a long list during accumluation. - Many new self tests for routing, TC, tunnels, etc. Too many contributors to mention them all, but I'm really happy to keep seeing this stuff. - Hardware timestamping support for dpaa_eth/fsl-fman from Yangbo Lu. - Lots of cleanups and fixes in L2TP code from Guillaume Nault. - Add IPSEC offload support to netdevsim, from Shannon Nelson. - Add support for slotting with non-uniform distribution to netem packet scheduler, from Yousuk Seung. - Add UDP GSO support to mlx5e, from Boris Pismenny. - Support offloading of Team LAG in NFP, from John Hurley. - Allow to configure TX queue selection based upon RX queue, from Amritha Nambiar. - Support ethtool ring size configuration in aquantia, from Anton Mikaev. - Support DSCP and flowlabel per-transport in SCTP, from Xin Long. - Support list based batching and stack traversal of SKBs, this is very exciting work. From Edward Cree. - Busyloop optimizations in vhost_net, from Toshiaki Makita. - Introduce the ETF qdisc, which allows time based transmissions. IGB can offload this in hardware. From Vinicius Costa Gomes. - Add parameter support to devlink, from Moshe Shemesh. - Several multiplication and division optimizations for BPF JIT in nfp driver, from Jiong Wang. - Lots of prepatory work to make more of the packet scheduler layer lockless, when possible, from Vlad Buslov. - Add ACK filter and NAT awareness to sch_cake packet scheduler, from Toke Høiland-Jørgensen. - Support regions and region snapshots in devlink, from Alex Vesker. - Allow to attach XDP programs to both HW and SW at the same time on a given device, with initial support in nfp. From Jakub Kicinski. - Add TLS RX offload and support in mlx5, from Ilya Lesokhin. - Use PHYLIB in r8169 driver, from Heiner Kallweit. - All sorts of changes to support Spectrum 2 in mlxsw driver, from Ido Schimmel. - PTP support in mv88e6xxx DSA driver, from Andrew Lunn. - Make TCP_USER_TIMEOUT socket option more accurate, from Jon Maxwell. - Support for templates in packet scheduler classifier, from Jiri Pirko. - IPV6 support in RDS, from Ka-Cheong Poon. - Native tproxy support in nf_tables, from Máté Eckl. - Maintain IP fragment queue in an rbtree, but optimize properly for in-order frags. From Peter Oskolkov. - Improvde handling of ACKs on hole repairs, from Yuchung Cheng"* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1996 commits) bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT" hv/netvsc: Fix NULL dereference at single queue mode fallback net: filter: mark expected switch fall-through xen-netfront: fix warn message as irq device name has '/' cxgb4: Add new T5 PCI device ids 0x50af and 0x50b0 net: dsa: mv88e6xxx: missing unlock on error path rds: fix building with IPV6=m inet/connection_sock: prefer _THIS_IP_ to current_text_addr net: dsa: mv88e6xxx: bitwise vs logical bug net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd() ieee802154: hwsim: using right kind of iteration net: hns3: Add vlan filter setting by ethtool command -K net: hns3: Set tx ring' tc info when netdev is up net: hns3: Remove tx ring BD len register in hns3_enet net: hns3: Fix desc num set to default when setting channel net: hns3: Fix for phy link issue when using marvell phy driver net: hns3: Fix for information of phydev lost problem when down/up net: hns3: Fix for command format parsing error in hclge_is_all_function_id_zero net: hns3: Add support for serdes loopback selftest bnxt_en: take coredump_record structure off stack ... List of files: /linux/net/llc/Makefile

a30461080366214b690a367225a48c95d7a6a189 - Merge remote-tracking branch 'net-next/master'

Mon, 06 Aug 2018 09:04:48 +0200

Merge remote-tracking branch 'net-next/master' List of files: /linux/net/llc/Makefile

7836899c34a514a741bd8e471fede61df798345b - Merge branch 'net-whitespace-cleanups'

Tue, 24 Jul 2018 23:10:43 +0200

Merge branch 'net-whitespace-cleanups'Stephen Hemminger says:====================net whitespace cleanupsRan script that I use to check for trailing whitespace andblank lines at end of files across all files in net/ directory.These are errors that checkpatch reports and git flags.These are the resulting fixes broken up mostly by subsystem.====================Signed-off-by: David S. Miller List of files: /linux/net/llc/Makefile

a87e87dbf3926ab43b862cd90ec122ebf7d5aad3 - llc: fix whitespace issues

Tue, 24 Jul 2018 21:29:04 +0200

llc: fix whitespace issuesSigned-off-by: Stephen Hemminger Signed-off-by: David S. Miller List of files: /linux/net/llc/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/net/llc/Makefile

3d5271f9883cba7b54762bc4fe027d4172f06db7 - Pull release into acpica branch

Tue, 06 Dec 2005 23:31:30 +0100

Pull release into acpica branch List of files: /linux/net/llc/Makefile

2fc2991175bf77395e6b15fe6b2304d3bf72da40 - Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

Sun, 06 Nov 2005 15:36:37 +0100

Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/ List of files: /linux/net/llc/Makefile

90890687859ea658759e653c4e70ed7e9e1a6217 - Merge branch 'master'

Fri, 28 Oct 2005 18:17:52 +0200

Merge branch 'master' List of files: /linux/net/llc/Makefile

9cec58dc138d6fcad9f447a19c8ff69f6540e667 - Update from upstream with manual merge of Yasunori Goto's

Thu, 20 Oct 2005 19:41:44 +0200

Update from upstream with manual merge of Yasunori Goto'schanges to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341since this file has been moved from arch/ia64/lib/swiotlb.c tolib/swiotlb.cSigned-off-by: Tony Luck List of files: /linux/net/llc/Makefile

312f5726055534be1dc9dd369be13aabd2943fcb - merge Linus head tree into my drm tree and fix up conflicts

Thu, 20 Oct 2005 10:21:33 +0200

merge Linus head tree into my drm tree and fix up conflicts List of files: /linux/net/llc/Makefile