Merge staging-next into staging

1 files changed, 0 insertions, 15 deletions

diff --git a/pkgs/development/compilers/llvm/3.5/fix-15974.patch b/pkgs/development/compilers/llvm/3.5/fix-15974.patch
deleted file mode 100644
index 446004cd9988..000000000000
--- a/pkgs/development/compilers/llvm/3.5/fix-15974.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h
-index f9df378..9d860ec 100644
---- a/include/llvm/ADT/IntrusiveRefCntPtr.h
-+++ b/include/llvm/ADT/IntrusiveRefCntPtr.h
-@@ -134,9 +134,9 @@ public:
- //===----------------------------------------------------------------------===//
-   template <typename T>
-   class IntrusiveRefCntPtr {
-+  public:
-     T* Obj;
- 
--  public:
-     typedef T element_type;
- 
-     explicit IntrusiveRefCntPtr() : Obj(nullptr) {}