Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH:
 "Here is the big staging and IIO driver update for 4.18-rc1.

  It was delayed as I wanted to make sure the final driver deletions did
  not cause any major merge issues, and all now looks good.

  There are a lot of patches here, just over 1000. The diffstat summary
  shows the major changes here:

	1007 files changed, 16828 insertions(+), 227770 deletions(-)

  Because of this, we might be close to shrinking the overall kernel
  source code size for two releases in a row.

  There was loads of work in this release cycle, primarily:

   - tons of ks7010 driver cleanups

   - lots of mt7621 driver fixes and cleanups

   - most driver cleanups

   - wilc1000 fixes and cleanups

   - lots and lots of IIO driver cleanups and new additions

   - debugfs cleanups for all staging drivers

   - lots of other staging driver cleanups and fixes, the shortlog has
     the full details.

  but the big user-visable things here are the removal of 3 chunks of
  code:

   - ncpfs and ipx were removed on schedule, no one has cared about this
     code since it moved to staging last year, and if it needs to come
     back, it can be reverted.

   - lustre file system is removed.

     I've ranted at the lustre developers about once a year for the past
     5 years, with no real forward progress at all to clean things up
     and get the code into the "real" part of the kernel.

     Given that the lustre developers continue to work on an external
     tree and try to port those changes to the in-kernel tree every once
     in a while, this whole thing really really is not working out at
     all. So I'm deleting it so that the developers can spend the time
     working in their out-of-tree location and get things cleaned up
     properly to get merged into the tree correctly at a later date.

  Because of these file removals, you will have merge issues on some of
  these files (2 in the ipx code, 1 in the ncpfs code, and 1 in the
  atomisp driver). Just delete those files, it's a simple merge :)

  All of this has been in linux-next for a while with no reported
  problems"

* tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1011 commits)
  staging: ipx: delete it from the tree
  ncpfs: remove uapi .h files
  ncpfs: remove Documentation
  ncpfs: remove compat functionality
  staging: ncpfs: delete it
  staging: lustre: delete the filesystem from the tree.
  staging: vc04_services: no need to save the log debufs dentries
  staging: vc04_services: vchiq_debugfs_log_entry can be a void *
  staging: vc04_services: remove struct vchiq_debugfs_info
  staging: vc04_services: move client dbg directory into static variable
  staging: vc04_services: remove odd vchiq_debugfs_top() wrapper
  staging: vc04_services: no need to check debugfs return values
  staging: mt7621-gpio: reorder includes alphabetically
  staging: mt7621-gpio: change gc_map to don't use pointers
  staging: mt7621-gpio: use GPIOF_DIR_OUT and GPIOF_DIR_IN macros instead of custom values
  staging: mt7621-gpio: change 'to_mediatek_gpio' to make just a one line return
  staging: mt7621-gpio: dt-bindings: update documentation for #interrupt-cells property
  staging: mt7621-gpio: update #interrupt-cells for the gpio node
  staging: mt7621-gpio: dt-bindings: complete documentation for the gpio
  staging: mt7621-dts: add missing properties to gpio node
  ...

1 files changed, 0 insertions, 202 deletions

diff --git a/include/uapi/linux/ncp.h b/include/uapi/linux/ncp.h
deleted file mode 100644
index ca6f3d42c88f..000000000000
--- a/include/uapi/linux/ncp.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- *  ncp.h
- *
- *  Copyright (C) 1995 by Volker Lendecke
- *  Modified for sparc by J.F. Chadima
- *  Modified for __constant_ntoh by Frank A. Vorstenbosch
- *
- */
-
-#ifndef _LINUX_NCP_H
-#define _LINUX_NCP_H
-
-#include <linux/types.h>
-
-#define NCP_PTYPE                (0x11)
-#define NCP_PORT                 (0x0451)
-
-#define NCP_ALLOC_SLOT_REQUEST   (0x1111)
-#define NCP_REQUEST              (0x2222)
-#define NCP_DEALLOC_SLOT_REQUEST (0x5555)
-
-struct ncp_request_header {
-        __u16 type;
-        __u8 sequence;
-        __u8 conn_low;
-        __u8 task;
-        __u8 conn_high;
-        __u8 function;
-        __u8 data[0];
-} __attribute__((packed));
-
-#define NCP_REPLY                (0x3333)
-#define NCP_WATCHDOG             (0x3E3E)
-#define NCP_POSITIVE_ACK         (0x9999)
-
-struct ncp_reply_header {
-        __u16 type;
-        __u8 sequence;
-        __u8 conn_low;
-        __u8 task;
-        __u8 conn_high;
-        __u8 completion_code;
-        __u8 connection_state;
-        __u8 data[0];
-} __attribute__((packed));
-
-#define NCP_VOLNAME_LEN (16)
-#define NCP_NUMBER_OF_VOLUMES (256)
-struct ncp_volume_info {
-        __u32 total_blocks;
-        __u32 free_blocks;
-        __u32 purgeable_blocks;
-        __u32 not_yet_purgeable_blocks;
-        __u32 total_dir_entries;
-        __u32 available_dir_entries;
-        __u8 sectors_per_block;
-        char volume_name[NCP_VOLNAME_LEN + 1];
-};
-
-#define AR_READ      (cpu_to_le16(1))
-#define AR_WRITE     (cpu_to_le16(2))
-#define AR_EXCLUSIVE (cpu_to_le16(0x20))
-
-#define NCP_FILE_ID_LEN 6
-
-/* Defines for Name Spaces */
-#define NW_NS_DOS     0
-#define NW_NS_MAC     1
-#define NW_NS_NFS     2
-#define NW_NS_FTAM    3
-#define NW_NS_OS2     4
-
-/*  Defines for ReturnInformationMask */
-#define RIM_NAME              (cpu_to_le32(1))
-#define RIM_SPACE_ALLOCATED   (cpu_to_le32(2))
-#define RIM_ATTRIBUTES        (cpu_to_le32(4))
-#define RIM_DATA_SIZE         (cpu_to_le32(8))
-#define RIM_TOTAL_SIZE        (cpu_to_le32(0x10))
-#define RIM_EXT_ATTR_INFO     (cpu_to_le32(0x20))
-#define RIM_ARCHIVE           (cpu_to_le32(0x40))
-#define RIM_MODIFY            (cpu_to_le32(0x80))
-#define RIM_CREATION          (cpu_to_le32(0x100))
-#define RIM_OWNING_NAMESPACE  (cpu_to_le32(0x200))
-#define RIM_DIRECTORY         (cpu_to_le32(0x400))
-#define RIM_RIGHTS            (cpu_to_le32(0x800))
-#define RIM_ALL               (cpu_to_le32(0xFFF))
-#define RIM_COMPRESSED_INFO   (cpu_to_le32(0x80000000))
-
-/* Defines for NSInfoBitMask */
-#define NSIBM_NFS_NAME          0x0001
-#define NSIBM_NFS_MODE          0x0002
-#define NSIBM_NFS_GID           0x0004
-#define NSIBM_NFS_NLINKS        0x0008
-#define NSIBM_NFS_RDEV          0x0010
-#define NSIBM_NFS_LINK          0x0020
-#define NSIBM_NFS_CREATED       0x0040
-#define NSIBM_NFS_UID           0x0080
-#define NSIBM_NFS_ACSFLAG       0x0100
-#define NSIBM_NFS_MYFLAG        0x0200
-
-/* open/create modes */
-#define OC_MODE_OPEN      0x01
-#define OC_MODE_TRUNCATE  0x02
-#define OC_MODE_REPLACE   0x02
-#define OC_MODE_CREATE    0x08
-
-/* open/create results */
-#define OC_ACTION_NONE     0x00
-#define OC_ACTION_OPEN     0x01
-#define OC_ACTION_CREATE   0x02
-#define OC_ACTION_TRUNCATE 0x04
-#define OC_ACTION_REPLACE  0x04
-
-/* access rights attributes */
-#ifndef AR_READ_ONLY
-#define AR_READ_ONLY       0x0001
-#define AR_WRITE_ONLY      0x0002
-#define AR_DENY_READ       0x0004
-#define AR_DENY_WRITE      0x0008
-#define AR_COMPATIBILITY   0x0010
-#define AR_WRITE_THROUGH   0x0040
-#define AR_OPEN_COMPRESSED 0x0100
-#endif
-
-struct nw_nfs_info {
-        __u32 mode;
-        __u32 rdev;
-};
-
-struct nw_info_struct {
-        __u32 spaceAlloc;
-        __le32 attributes;
-        __u16 flags;
-        __le32 dataStreamSize;
-        __le32 totalStreamSize;
-        __u16 numberOfStreams;
-        __le16 creationTime;
-        __le16 creationDate;
-        __u32 creatorID;
-        __le16 modifyTime;
-        __le16 modifyDate;
-        __u32 modifierID;
-        __le16 lastAccessDate;
-        __u16 archiveTime;
-        __u16 archiveDate;
-        __u32 archiverID;
-        __u16 inheritedRightsMask;
-        __le32 dirEntNum;
-        __le32 DosDirNum;
-        __u32 volNumber;
-        __u32 EADataSize;
-        __u32 EAKeyCount;
-        __u32 EAKeySize;
-        __u32 NSCreator;
-        __u8 nameLen;
-        __u8 entryName[256];
-        /* libncp may depend on there being nothing after entryName */
-#ifdef __KERNEL__
-        struct nw_nfs_info nfs;
-#endif
-} __attribute__((packed));
-
-/* modify mask - use with MODIFY_DOS_INFO structure */
-#define DM_ATTRIBUTES             (cpu_to_le32(0x02))
-#define DM_CREATE_DATE            (cpu_to_le32(0x04))
-#define DM_CREATE_TIME            (cpu_to_le32(0x08))
-#define DM_CREATOR_ID             (cpu_to_le32(0x10))
-#define DM_ARCHIVE_DATE           (cpu_to_le32(0x20))
-#define DM_ARCHIVE_TIME           (cpu_to_le32(0x40))
-#define DM_ARCHIVER_ID            (cpu_to_le32(0x80))
-#define DM_MODIFY_DATE            (cpu_to_le32(0x0100))
-#define DM_MODIFY_TIME            (cpu_to_le32(0x0200))
-#define DM_MODIFIER_ID            (cpu_to_le32(0x0400))
-#define DM_LAST_ACCESS_DATE       (cpu_to_le32(0x0800))
-#define DM_INHERITED_RIGHTS_MASK  (cpu_to_le32(0x1000))
-#define DM_MAXIMUM_SPACE          (cpu_to_le32(0x2000))
-
-struct nw_modify_dos_info {
-        __le32 attributes;
-        __le16 creationDate;
-        __le16 creationTime;
-        __u32 creatorID;
-        __le16 modifyDate;
-        __le16 modifyTime;
-        __u32 modifierID;
-        __u16 archiveDate;
-        __u16 archiveTime;
-        __u32 archiverID;
-        __le16 lastAccessDate;
-        __u16 inheritanceGrantMask;
-        __u16 inheritanceRevokeMask;
-        __u32 maximumSpace;
-} __attribute__((packed));
-
-struct nw_search_sequence {
-        __u8 volNumber;
-        __u32 dirBase;
-        __u32 sequence;
-} __attribute__((packed));
-
-#endif                          /* _LINUX_NCP_H */