Conditionally add patch for kernel 3.12, bug 488072

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

7 files changed, 93 insertions, 22 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 86a4aa473205..b5147ec2b40d 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.119 2014/06/07 22:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.120 2014/06/07 22:25:33 dilfridge Exp $
+
+  07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
+  vmware-modules-279.2.ebuild, +files/271-vfsfollowlink.patch,
+  +files/279-vfsfollowlink.patch:
+  Conditionally add patch for kernel 3.12, bug 488072
 
   07 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   vmware-modules-271.3.ebuild, vmware-modules-279.1-r1.ebuild,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index d24302ac8a9f..134b0143f3d7 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -19,6 +19,7 @@ AUX 271-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363
 AUX 271-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6
 AUX 271-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
 AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
+AUX 271-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3cccc954bf6a82960e78ebd120c1eb2aac68e8
 AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
 AUX 279-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
 AUX 279-filldir.patch 2485 SHA256 539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937 WHIRLPOOL a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
@@ -27,29 +28,30 @@ AUX 279-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363
 AUX 279-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6
 AUX 279-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
 AUX 279-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
+AUX 279-vfsfollowlink.patch 1219 SHA256 b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d WHIRLPOOL 3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3cccc954bf6a82960e78ebd120c1eb2aac68e8
 AUX 279-vmblock.patch 1041 SHA256 217d27619ac782711686cffee44fbc4bbb40eb0657f335357ad1b0d064f30a35 SHA512 e8e565b677110090cb5bdb7c18d3e97c31049d846b82ee0406aa27dbfa9af8afc39512f1314d49edd6108ec576f3cbc565921de8dfdaaefe2822029ef98c303c WHIRLPOOL 769d0cffcb186d6110de049db963e20e049ef11d92b872c1a6ecfe262acad6c17f456376d219ce01e22839ddcb6a21a2d3e995d797f4c962a0838318dc6f56f9
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
-EBUILD vmware-modules-271.3.ebuild 2250 SHA256 9e3431e8c50d21218eb4cb1290d888a318285f08f3d2061ca9e0839f740dc5db SHA512 d39772a0e673ef8d1c4b62cf3c7de7c7f4ce520cde76434e5dcb2dd5671da877cc422dfa6a3ac5b901b72527362e377f44192dcb3fa180eb35022a4282b9b869 WHIRLPOOL 17de7299cd50f0e16432ac12b9fc152da2c34168c2b988e2349ac9686bfeaa7bd99d99878983facd0e771009bf50b25541a86e9b2333fe5c5ee3a757b089071c
-EBUILD vmware-modules-279.1-r1.ebuild 2754 SHA256 81752c4d99b5adddf1e15f35b90ceb684ba011348388f013a414d657cd4f4af5 SHA512 a9b2b788c00016dc3b59e15ed611e3565b03f7a0497c79ae7bcfe4f9cc769a652fcd03fb8abc5e7c48e39c4d64c8e16d5e3cc8a90f29654b21de4bee517d0b9d WHIRLPOOL 0cb6991af1b35b5bb6613a73aee8265005a0c3296863ed4429f91b15e0d12eded7d1b62392a16bbbf405c57b5b5cb99141f65533e724ad859997f2318cced54a
-EBUILD vmware-modules-279.2.ebuild 2751 SHA256 1125ff20d178da6bf3f9a47bb4aa5f837ccabaaf277aa6636918b334a08e5d0b SHA512 116d3ef6e2c15e5ebf60178a939b1c56b0b6cb7bdab6707d77f2df489079027e9274abcc73fd6c7e1ab70cab0c741b302035cd7079d02365ccd81b0cfcbdc51f WHIRLPOOL 9a111d171934724dcdb4b986678fcb7f6f9cd9a85e86fb1676f2847ae4524888f92bdc7cde4b59fd9cc29c70c2bb7dcb5dfa72a4fc57ec6f9de9dc3bf35e2243
-MISC ChangeLog 26139 SHA256 1f5785e17675c3ebdd95185ed89d26aee96e572ece2ca36ba0ee893a0ce2aa2e SHA512 66145b86a765260344781cd8f7bcdf882c765350d5566bf88a57dfbb60c3c8112d12a93186649784efaf494f5d388f8b4a2afbc2e9525c167e09258d636356b4 WHIRLPOOL 1b0dc2d56876997ab043d926ea6b247b5c5da5b9d4ee0f8295ef75695da381a7b7a486d2b12aaddd724fd5e8752aabe1411ac32c54295e279f4bf6ef7d861a69
+EBUILD vmware-modules-271.3.ebuild 2327 SHA256 03a2dc679b1e7e1e72fcf46c4b43a142abaaff183759a24f97d5e547722c1e39 SHA512 d72c2e798c3e9e8eff28f5986e5d82d896572a088ddf71f72510025e58d6b054c235c7217b24aa75ed4fedb2df8a0ece1bca698070ea8188fe1efa5a7d4d91ad WHIRLPOOL a95e8a7978f44331c8d3dd693508e1ce882af185c0bc0818644de4a7c408db2190f27c400e4864374732cea086183f629dbd510302e19aa5cbad6918e7436470
+EBUILD vmware-modules-279.1-r1.ebuild 2831 SHA256 86aacd4fcbad015b487565d0c21230927b05a5c4f1a223bbbec89b7288f95ef5 SHA512 e52be72e684c21128357631011c279dd6250d296df1ebb7c488e745827af17fa99e31945193f817278b41b1e2fc47460b5dae52004bf51e38822c4700a985c07 WHIRLPOOL 485b504c8c06e36423592fe10334a4975a146414171acdff250c29942adcdb66139eafbaa2f043b5a221479fbb27dcfeeecca2569ebaee19418144f610b19da4
+EBUILD vmware-modules-279.2.ebuild 2828 SHA256 e9b40f2e5e40512a98588976b1c7509e74882d81c6a6ce4cf282b7d8180a1567 SHA512 8e6943c5cbe1e63e1f71cf824c2b445abb7885abc8e0e68c1e75495a6491c3533f6fb5b06d37780ec7c9727224199a9a1080e6a62f3bba4b75b7d222a7464893 WHIRLPOOL d17a88c75719ac1b7b7da4a0cd525e7ab64f558e690d6ec6169f9c7b746277ccd298bd78ba951f5305a4f819984cb0291789cfe5cc2d74077d52814a026f7451
+MISC ChangeLog 26411 SHA256 9ef1e59ccd4e79737070fb0a002bb9115b7a429475601c83d2fcccd3508c8d93 SHA512 84c1d0b7e453195c7b3bc2e8e5d3999962a2f69b8e2110bd6a80685134b1c65e09f4ee75a496b466ea23c2759a38bb09263e782a6b534c5211c09949b42a8c19 WHIRLPOOL cd1d824cc792fff05c16ec43417f9d919e70a2982a8a1e5c602c10ffce3fe236673eed961a409f9a3885d98796edac2946648707e19b37dc1943b926796f5d50
 MISC metadata.xml 626 SHA256 df85fe94586e898742dda5a30bf95be1c66bded72b9b679b4bda9fb3113bb94a SHA512 5c16977fa1e95f123891324b24d20161bfbfa5f4a38371374290e635bba33cbbc933761f44b826503c37e4bb2295c4026356eddc6aef091c07dc17f773f538ec WHIRLPOOL f83d377fa941fbcfe25dfc83ad276f55782c1e9bdff6dc7ae147be667d7129ae55dae6c19c18544dc27123977d3aa6273f185b4cced70ab841e87a04a4fcae82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTk42SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTk5FeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOchxUQAKNhtAQ5YCNvOwgd2pabUUW/
-4w4a7GbJVaf7a4Sm2Q8LYgE3yP3lJrWpYlCJpofrkzmRVtOAOK7mBEbulPCBjOOR
-nqSB2PcgvcCp/91wDr0URBa2c4vg9LnEVsmuiT3c3E951GQd0oI43erkkZ/5nI9n
-m6UI3yWly2fZ5W5CGSbTYYww5vZBe5L2VuOgqEDO4iOl5KSXsn1+qRnB07u/K2TI
-6d515kO9B8xQoXohwn1/WGxGJigKzeO2MEDQhlEx+5wV7u64BiOekshsSvOyCDTq
-DrT7OtHOcqxWx+IDCjaGd1p1R/M0GOCb6fBIHHDCM3F6T7wecOgjBWbysNL7/AmM
-UfP+nJJFgQx2yuhFU7eBc2s/9JjRX6QDBWo93Px/pkTwYVthPNom3j8gkZTM9aAV
-GtKvAGWY0Q82go+Ay3cFcgmdIStI/+OaJEl8twEQOb0Hx/fzzcE4z5IqDfJ8+QN9
-fgyiQEurCBSzMXSIl4Yjg651B0/ndSb8vMR0B0VDebmGyZCWzBf02dk5d+jNZ6ev
-gWNLpXS3tAs53ePySQ0MnuMNyThNoj1MZ62cUkry1mwHBbnrQdLinDcdA8TE6H+m
-keucq96hPmm38z1oai5fWNnHgaZQZg8m68ln7RAstcYnRbQoMFdF+v8E4/4dqe7R
-qhi2YQC405/qpJYG4uFT
-=Vhp5
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc434P/juYmCnLZ1h0lmotf7OBLonA
+X5FhIJk1DXXEcJrp4AUJnqVeyzgSNaFGezqPYweNxKOZmpeZndKYBVKmQksltDNh
+nga4Duv5KWeQFl9w8dEqPyAsc2KWFJnRTRWAOtsAVKPLZSZRHqJu1zE/cE8Yi2fe
+4PVYHxtnfE6YE16IWC37G1gNl1FmiN0/o8iuSM+b33x5/yFDHGepYLPc8v+amatf
+1Pm5zK7Rp4rVKg1Hie7fvEv3ya4Q9eiA21FfKk+fdpRl7lNfDtUIP3bTxxF1G0CA
+L9AUg6qIyk90NiqVb+BBai9jl5loCqZ7yo/JkjO45NYBk9KAd2vsZ+KJKBWnPiR0
+LRUlL4KnxcxUtYafC0nVXbGQKWm6AoAVANmErooJh5ZaRqlVLdDBXgNXJbHDDIsE
+CQpLWHKWriRTlE2AG1q9ISnzhactdaKFgOC2NJq2x91BexmpdqjdAXj3Bek/dGIu
+BhOIv7hrrrXsKtamQw9HuvKBlqgiNKO2Kh8SShnfRYJqGHGZ+fsjxwPaTQMrws5B
+Ry4rpBYmm9TLbZQ6E3uhm9tKDtjvok0Mwksh/MbOBPBjoDfI5WVmV2RVFmxmE+u/
+BEuuO/96nnMe72KgA/GlcPvUR8UwbCll4SXJn7zfrAfl8h8zLLDIgqWQnUzIteGD
+l2eksT3w9dk8NmBU/dO3
+=BIgN
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/271-vfsfollowlink.patch b/app-emulation/vmware-modules/files/271-vfsfollowlink.patch
new file mode 100644
index 000000000000..13f600e39f33
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-vfsfollowlink.patch
@@ -0,0 +1,30 @@
+diff -Naur a/linux/inode.c b/linux/inode.c
+--- a/vmblock-only/linux/inode.c	2013-10-03 04:29:47.471339204 -0400
++++ b/vmblock-only/linux/inode.c	2013-10-03 04:31:56.607334636 -0400
+@@ -36,7 +36,7 @@
+ 
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++                                    struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++              unsigned int flags)     // IN: lookup intent and information
+ {
+    char *filename;
+    struct inode *inode;
+@@ -221,7 +221,7 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/files/279-vfsfollowlink.patch b/app-emulation/vmware-modules/files/279-vfsfollowlink.patch
new file mode 100644
index 000000000000..13f600e39f33
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-vfsfollowlink.patch
@@ -0,0 +1,30 @@
+diff -Naur a/linux/inode.c b/linux/inode.c
+--- a/vmblock-only/linux/inode.c	2013-10-03 04:29:47.471339204 -0400
++++ b/vmblock-only/linux/inode.c	2013-10-03 04:31:56.607334636 -0400
+@@ -36,7 +36,7 @@
+ 
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++                                    struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++              unsigned int flags)     // IN: lookup intent and information
+ {
+    char *filename;
+    struct inode *inode;
+@@ -221,7 +221,7 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
index c01f1b0f15fc..17a7a0f22abb 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.3.ebuild,v 1.3 2014/06/07 22:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.3.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
 
 EAPI="4"
 
@@ -67,6 +67,7 @@ src_prepare() {
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10.0.patch"
 	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
index b26cacf57a2a..26bbc484c0ad 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.3 2014/06/07 22:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
 
 EAPI=5
 
@@ -81,6 +81,7 @@ src_prepare() {
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
 	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
diff --git a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
index 5e43840ddc1f..b4c35887f32d 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.3 2014/06/07 22:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.2.ebuild,v 1.4 2014/06/07 22:25:33 dilfridge Exp $
 
 EAPI=5
 
@@ -81,6 +81,7 @@ src_prepare() {
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
 	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
 	kernel_is ge 3 10 25 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user