From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CBDB613829C for ; Mon, 30 May 2016 21:52:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A14F0254022; Mon, 30 May 2016 21:52:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E5A3254022 for ; Mon, 30 May 2016 21:52:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E7FA340BE2 for ; Mon, 30 May 2016 21:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8DE195D for ; Mon, 30 May 2016 21:52:49 +0000 (UTC) From: "Fabio Rossi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Rossi" Message-ID: <1464645044.92a78cb3305fc182764cb0c6b2c44892dcc35212.fabio@gentoo> Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/ X-VCS-Repository: proj/vmware X-VCS-Files: app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild X-VCS-Directories: app-emulation/vmware-modules/ app-emulation/vmware-modules/files/ X-VCS-Committer: fabio X-VCS-Committer-Name: Fabio Rossi X-VCS-Revision: 92a78cb3305fc182764cb0c6b2c44892dcc35212 X-VCS-Branch: master Date: Mon, 30 May 2016 21:52:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e60760c-8fdd-4691-899d-8a15eb5b7421 X-Archives-Hash: 25995595ccb659cc53b036b889f6526c commit: 92a78cb3305fc182764cb0c6b2c44892dcc35212 Author: Fabio Rossi inwind it> AuthorDate: Mon May 30 21:50:44 2016 +0000 Commit: Fabio Rossi inwind net> CommitDate: Mon May 30 21:50:44 2016 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92a78cb3 app-emulation/vmware-modules: add support to kernel 4.7 Fix compilation with latest 4.7-rc1 taking example from kernel commit 860e9538a9482bb84589f7d0718a7e6d0a944d58 .../vmware-modules/files/304-4.7-00-trans_start.patch | 11 +++++++++++ .../vmware-modules/files/308-4.07-00-trans_start.patch | 11 +++++++++++ app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild | 1 + app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild | 1 + 4 files changed, 24 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch new file mode 100644 index 0000000..751924f --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch @@ -0,0 +1,11 @@ +--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200 ++++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200 +@@ -465,7 +465,7 @@ + VNetSend(&netIf->port.jack, skb); + + netIf->stats.tx_packets++; +- dev->trans_start = jiffies; ++ netif_trans_update(dev); + + return 0; + } diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch new file mode 100644 index 0000000..751924f --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch @@ -0,0 +1,11 @@ +--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200 ++++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200 +@@ -465,7 +465,7 @@ + VNetSend(&netIf->port.jack, skb); + + netIf->stats.tx_packets++; +- dev->trans_start = jiffies; ++ netif_trans_update(dev); + + return 0; + } diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild index c56f4de..665965c 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild @@ -102,6 +102,7 @@ src_prepare() { kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch" kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch" kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch" + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild index a7e1daa..1bfbcb4 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild @@ -102,6 +102,7 @@ src_prepare() { kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch" kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch" kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch" + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user