* [PATCH net-next v2 1/2] ipx: move Novell IPX protocol support into staging
2017-11-14 16:37 [PATCH net-next v2 0/2] retire IPX and NCPFS Stephen Hemminger
@ 2017-11-14 16:37 ` Stephen Hemminger
2017-11-14 16:37 ` [PATCH net-next v2 2/2] ncpfs: move net/ncpfs to drivers/staging/ncpfs Stephen Hemminger
2017-11-15 0:58 ` [PATCH net-next v2 0/2] retire IPX and NCPFS David Miller
2 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2017-11-14 16:37 UTC (permalink / raw)
To: viro, davem
Cc: devel, netdev, linux-fsdevel, Stephen Hemminger,
Stephen Hemminger
The Netware IPX protocol is very old and no one should still be using
it. It is time to move it into staging for a while and eventually
decommision it.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v2 add a TODO (don't touch me) file
MAINTAINERS | 3 +--
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
{net => drivers/staging}/ipx/Kconfig | 0
{net => drivers/staging}/ipx/Makefile | 0
drivers/staging/ipx/TODO | 4 ++++
{net => drivers/staging}/ipx/af_ipx.c | 0
{net => drivers/staging}/ipx/ipx_proc.c | 0
{net => drivers/staging}/ipx/ipx_route.c | 0
{net => drivers/staging}/ipx/pe2.c | 0
{net => drivers/staging}/ipx/sysctl_net_ipx.c | 0
net/Kconfig | 1 -
net/Makefile | 1 -
13 files changed, 8 insertions(+), 4 deletions(-)
rename {net => drivers/staging}/ipx/Kconfig (100%)
rename {net => drivers/staging}/ipx/Makefile (100%)
create mode 100644 drivers/staging/ipx/TODO
rename {net => drivers/staging}/ipx/af_ipx.c (100%)
rename {net => drivers/staging}/ipx/ipx_proc.c (100%)
rename {net => drivers/staging}/ipx/ipx_route.c (100%)
rename {net => drivers/staging}/ipx/pe2.c (100%)
rename {net => drivers/staging}/ipx/sysctl_net_ipx.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 29aa89a1837b..54c29ebcec55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7206,9 +7206,8 @@ F: drivers/tty/ipwireless/
IPX NETWORK LAYER
L: netdev@vger.kernel.org
S: Odd fixes
-F: include/net/ipx.h
F: include/uapi/linux/ipx.h
-F: net/ipx/
+F: drivers/staging/ipx/
IRDA SUBSYSTEM
M: Samuel Ortiz <samuel@sortiz.org>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 554683912cff..3744640bed5a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -26,6 +26,8 @@ if STAGING
source "drivers/staging/irda/net/Kconfig"
+source "drivers/staging/ipx/Kconfig"
+
source "drivers/staging/wlan-ng/Kconfig"
source "drivers/staging/comedi/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 6e536020029a..f4c0506470ff 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -3,6 +3,7 @@
obj-y += media/
obj-y += typec/
+obj-$(CONFIG_IPX) += ipx/
obj-$(CONFIG_IRDA) += irda/net/
obj-$(CONFIG_IRDA) += irda/drivers/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
diff --git a/net/ipx/Kconfig b/drivers/staging/ipx/Kconfig
similarity index 100%
rename from net/ipx/Kconfig
rename to drivers/staging/ipx/Kconfig
diff --git a/net/ipx/Makefile b/drivers/staging/ipx/Makefile
similarity index 100%
rename from net/ipx/Makefile
rename to drivers/staging/ipx/Makefile
diff --git a/drivers/staging/ipx/TODO b/drivers/staging/ipx/TODO
new file mode 100644
index 000000000000..80db5d968264
--- /dev/null
+++ b/drivers/staging/ipx/TODO
@@ -0,0 +1,4 @@
+The ipx code will be removed soon from the kernel tree as it is old and
+obsolete and broken.
+
+Don't worry about fixing up anything here, it's not needed.
diff --git a/net/ipx/af_ipx.c b/drivers/staging/ipx/af_ipx.c
similarity index 100%
rename from net/ipx/af_ipx.c
rename to drivers/staging/ipx/af_ipx.c
diff --git a/net/ipx/ipx_proc.c b/drivers/staging/ipx/ipx_proc.c
similarity index 100%
rename from net/ipx/ipx_proc.c
rename to drivers/staging/ipx/ipx_proc.c
diff --git a/net/ipx/ipx_route.c b/drivers/staging/ipx/ipx_route.c
similarity index 100%
rename from net/ipx/ipx_route.c
rename to drivers/staging/ipx/ipx_route.c
diff --git a/net/ipx/pe2.c b/drivers/staging/ipx/pe2.c
similarity index 100%
rename from net/ipx/pe2.c
rename to drivers/staging/ipx/pe2.c
diff --git a/net/ipx/sysctl_net_ipx.c b/drivers/staging/ipx/sysctl_net_ipx.c
similarity index 100%
rename from net/ipx/sysctl_net_ipx.c
rename to drivers/staging/ipx/sysctl_net_ipx.c
diff --git a/net/Kconfig b/net/Kconfig
index 9dba2715919d..ff71ba0f6c27 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -212,7 +212,6 @@ source "net/dsa/Kconfig"
source "net/8021q/Kconfig"
source "net/decnet/Kconfig"
source "net/llc/Kconfig"
-source "net/ipx/Kconfig"
source "drivers/net/appletalk/Kconfig"
source "net/x25/Kconfig"
source "net/lapb/Kconfig"
diff --git a/net/Makefile b/net/Makefile
index 14fede520840..a6147c61b174 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_PACKET) += packet/
obj-$(CONFIG_NET_KEY) += key/
obj-$(CONFIG_BRIDGE) += bridge/
obj-$(CONFIG_NET_DSA) += dsa/
-obj-$(CONFIG_IPX) += ipx/
obj-$(CONFIG_ATALK) += appletalk/
obj-$(CONFIG_X25) += x25/
obj-$(CONFIG_LAPB) += lapb/
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v2 2/2] ncpfs: move net/ncpfs to drivers/staging/ncpfs
2017-11-14 16:37 [PATCH net-next v2 0/2] retire IPX and NCPFS Stephen Hemminger
2017-11-14 16:37 ` [PATCH net-next v2 1/2] ipx: move Novell IPX protocol support into staging Stephen Hemminger
@ 2017-11-14 16:37 ` Stephen Hemminger
2017-11-15 0:58 ` [PATCH net-next v2 0/2] retire IPX and NCPFS David Miller
2 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2017-11-14 16:37 UTC (permalink / raw)
To: viro, davem
Cc: devel, netdev, linux-fsdevel, Stephen Hemminger,
Stephen Hemminger
The Netware Core Protocol is a file system that talks to
Netware clients over IPX. Since IPX has been dead for many years
move the file system into staging for eventual interment.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v2 add a TODO (don't touch me) file
MAINTAINERS | 2 +-
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
{fs => drivers/staging}/ncpfs/Kconfig | 0
{fs => drivers/staging}/ncpfs/Makefile | 0
drivers/staging/ncpfs/TODO | 4 ++++
{fs => drivers/staging}/ncpfs/dir.c | 0
{fs => drivers/staging}/ncpfs/file.c | 0
{fs => drivers/staging}/ncpfs/getopt.c | 0
{fs => drivers/staging}/ncpfs/getopt.h | 0
{fs => drivers/staging}/ncpfs/inode.c | 0
{fs => drivers/staging}/ncpfs/ioctl.c | 0
{fs => drivers/staging}/ncpfs/mmap.c | 0
{fs => drivers/staging}/ncpfs/ncp_fs.h | 0
{fs => drivers/staging}/ncpfs/ncp_fs_i.h | 0
{fs => drivers/staging}/ncpfs/ncp_fs_sb.h | 0
{fs => drivers/staging}/ncpfs/ncplib_kernel.c | 0
{fs => drivers/staging}/ncpfs/ncplib_kernel.h | 0
{fs => drivers/staging}/ncpfs/ncpsign_kernel.c | 0
{fs => drivers/staging}/ncpfs/ncpsign_kernel.h | 0
{fs => drivers/staging}/ncpfs/sock.c | 0
{fs => drivers/staging}/ncpfs/symlink.c | 0
fs/Kconfig | 1 -
fs/Makefile | 1 -
24 files changed, 8 insertions(+), 3 deletions(-)
rename {fs => drivers/staging}/ncpfs/Kconfig (100%)
rename {fs => drivers/staging}/ncpfs/Makefile (100%)
create mode 100644 drivers/staging/ncpfs/TODO
rename {fs => drivers/staging}/ncpfs/dir.c (100%)
rename {fs => drivers/staging}/ncpfs/file.c (100%)
rename {fs => drivers/staging}/ncpfs/getopt.c (100%)
rename {fs => drivers/staging}/ncpfs/getopt.h (100%)
rename {fs => drivers/staging}/ncpfs/inode.c (100%)
rename {fs => drivers/staging}/ncpfs/ioctl.c (100%)
rename {fs => drivers/staging}/ncpfs/mmap.c (100%)
rename {fs => drivers/staging}/ncpfs/ncp_fs.h (100%)
rename {fs => drivers/staging}/ncpfs/ncp_fs_i.h (100%)
rename {fs => drivers/staging}/ncpfs/ncp_fs_sb.h (100%)
rename {fs => drivers/staging}/ncpfs/ncplib_kernel.c (100%)
rename {fs => drivers/staging}/ncpfs/ncplib_kernel.h (100%)
rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.c (100%)
rename {fs => drivers/staging}/ncpfs/ncpsign_kernel.h (100%)
rename {fs => drivers/staging}/ncpfs/sock.c (100%)
rename {fs => drivers/staging}/ncpfs/symlink.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 54c29ebcec55..5ed623ad5717 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9276,7 +9276,7 @@ F: drivers/net/ethernet/natsemi/natsemi.c
NCP FILESYSTEM
M: Petr Vandrovec <petr@vandrovec.name>
S: Odd Fixes
-F: fs/ncpfs/
+F: drivers/staging/ncpfs/
NCR 5380 SCSI DRIVERS
M: Finn Thain <fthain@telegraphics.com.au>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 3744640bed5a..e95ab683331e 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -28,6 +28,8 @@ source "drivers/staging/irda/net/Kconfig"
source "drivers/staging/ipx/Kconfig"
+source "drivers/staging/ncpfs/Kconfig"
+
source "drivers/staging/wlan-ng/Kconfig"
source "drivers/staging/comedi/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index f4c0506470ff..af8cd6a3a1f6 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -4,6 +4,7 @@
obj-y += media/
obj-y += typec/
obj-$(CONFIG_IPX) += ipx/
+obj-$(CONFIG_NCP_FS) += ncpfs/
obj-$(CONFIG_IRDA) += irda/net/
obj-$(CONFIG_IRDA) += irda/drivers/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
diff --git a/fs/ncpfs/Kconfig b/drivers/staging/ncpfs/Kconfig
similarity index 100%
rename from fs/ncpfs/Kconfig
rename to drivers/staging/ncpfs/Kconfig
diff --git a/fs/ncpfs/Makefile b/drivers/staging/ncpfs/Makefile
similarity index 100%
rename from fs/ncpfs/Makefile
rename to drivers/staging/ncpfs/Makefile
diff --git a/drivers/staging/ncpfs/TODO b/drivers/staging/ncpfs/TODO
new file mode 100644
index 000000000000..9b6d38b7e248
--- /dev/null
+++ b/drivers/staging/ncpfs/TODO
@@ -0,0 +1,4 @@
+The ncpfs code will be removed soon from the kernel tree as it is old and
+obsolete and broken.
+
+Don't worry about fixing up anything here, it's not needed.
diff --git a/fs/ncpfs/dir.c b/drivers/staging/ncpfs/dir.c
similarity index 100%
rename from fs/ncpfs/dir.c
rename to drivers/staging/ncpfs/dir.c
diff --git a/fs/ncpfs/file.c b/drivers/staging/ncpfs/file.c
similarity index 100%
rename from fs/ncpfs/file.c
rename to drivers/staging/ncpfs/file.c
diff --git a/fs/ncpfs/getopt.c b/drivers/staging/ncpfs/getopt.c
similarity index 100%
rename from fs/ncpfs/getopt.c
rename to drivers/staging/ncpfs/getopt.c
diff --git a/fs/ncpfs/getopt.h b/drivers/staging/ncpfs/getopt.h
similarity index 100%
rename from fs/ncpfs/getopt.h
rename to drivers/staging/ncpfs/getopt.h
diff --git a/fs/ncpfs/inode.c b/drivers/staging/ncpfs/inode.c
similarity index 100%
rename from fs/ncpfs/inode.c
rename to drivers/staging/ncpfs/inode.c
diff --git a/fs/ncpfs/ioctl.c b/drivers/staging/ncpfs/ioctl.c
similarity index 100%
rename from fs/ncpfs/ioctl.c
rename to drivers/staging/ncpfs/ioctl.c
diff --git a/fs/ncpfs/mmap.c b/drivers/staging/ncpfs/mmap.c
similarity index 100%
rename from fs/ncpfs/mmap.c
rename to drivers/staging/ncpfs/mmap.c
diff --git a/fs/ncpfs/ncp_fs.h b/drivers/staging/ncpfs/ncp_fs.h
similarity index 100%
rename from fs/ncpfs/ncp_fs.h
rename to drivers/staging/ncpfs/ncp_fs.h
diff --git a/fs/ncpfs/ncp_fs_i.h b/drivers/staging/ncpfs/ncp_fs_i.h
similarity index 100%
rename from fs/ncpfs/ncp_fs_i.h
rename to drivers/staging/ncpfs/ncp_fs_i.h
diff --git a/fs/ncpfs/ncp_fs_sb.h b/drivers/staging/ncpfs/ncp_fs_sb.h
similarity index 100%
rename from fs/ncpfs/ncp_fs_sb.h
rename to drivers/staging/ncpfs/ncp_fs_sb.h
diff --git a/fs/ncpfs/ncplib_kernel.c b/drivers/staging/ncpfs/ncplib_kernel.c
similarity index 100%
rename from fs/ncpfs/ncplib_kernel.c
rename to drivers/staging/ncpfs/ncplib_kernel.c
diff --git a/fs/ncpfs/ncplib_kernel.h b/drivers/staging/ncpfs/ncplib_kernel.h
similarity index 100%
rename from fs/ncpfs/ncplib_kernel.h
rename to drivers/staging/ncpfs/ncplib_kernel.h
diff --git a/fs/ncpfs/ncpsign_kernel.c b/drivers/staging/ncpfs/ncpsign_kernel.c
similarity index 100%
rename from fs/ncpfs/ncpsign_kernel.c
rename to drivers/staging/ncpfs/ncpsign_kernel.c
diff --git a/fs/ncpfs/ncpsign_kernel.h b/drivers/staging/ncpfs/ncpsign_kernel.h
similarity index 100%
rename from fs/ncpfs/ncpsign_kernel.h
rename to drivers/staging/ncpfs/ncpsign_kernel.h
diff --git a/fs/ncpfs/sock.c b/drivers/staging/ncpfs/sock.c
similarity index 100%
rename from fs/ncpfs/sock.c
rename to drivers/staging/ncpfs/sock.c
diff --git a/fs/ncpfs/symlink.c b/drivers/staging/ncpfs/symlink.c
similarity index 100%
rename from fs/ncpfs/symlink.c
rename to drivers/staging/ncpfs/symlink.c
diff --git a/fs/Kconfig b/fs/Kconfig
index 7aee6d699fd6..eaf968bf9cfc 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -298,7 +298,6 @@ config NFS_COMMON
source "net/sunrpc/Kconfig"
source "fs/ceph/Kconfig"
source "fs/cifs/Kconfig"
-source "fs/ncpfs/Kconfig"
source "fs/coda/Kconfig"
source "fs/afs/Kconfig"
source "fs/9p/Kconfig"
diff --git a/fs/Makefile b/fs/Makefile
index ef772f1eaff8..add789ea270a 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -92,7 +92,6 @@ obj-$(CONFIG_LOCKD) += lockd/
obj-$(CONFIG_NLS) += nls/
obj-$(CONFIG_SYSV_FS) += sysv/
obj-$(CONFIG_CIFS) += cifs/
-obj-$(CONFIG_NCP_FS) += ncpfs/
obj-$(CONFIG_HPFS_FS) += hpfs/
obj-$(CONFIG_NTFS_FS) += ntfs/
obj-$(CONFIG_UFS_FS) += ufs/
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net-next v2 0/2] retire IPX and NCPFS
2017-11-14 16:37 [PATCH net-next v2 0/2] retire IPX and NCPFS Stephen Hemminger
2017-11-14 16:37 ` [PATCH net-next v2 1/2] ipx: move Novell IPX protocol support into staging Stephen Hemminger
2017-11-14 16:37 ` [PATCH net-next v2 2/2] ncpfs: move net/ncpfs to drivers/staging/ncpfs Stephen Hemminger
@ 2017-11-15 0:58 ` David Miller
2017-11-15 9:13 ` Greg KH
2017-11-15 17:41 ` Stephen Hemminger
2 siblings, 2 replies; 7+ messages in thread
From: David Miller @ 2017-11-15 0:58 UTC (permalink / raw)
To: stephen; +Cc: viro, devel, netdev, linux-fsdevel, sthemmin
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 14 Nov 2017 08:37:13 -0800
> These are both old decrepit protocols that need to be sent
> to pasture.
These need to go to gregkh and his staging/ tree, not net-next.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/2] retire IPX and NCPFS
2017-11-15 0:58 ` [PATCH net-next v2 0/2] retire IPX and NCPFS David Miller
@ 2017-11-15 9:13 ` Greg KH
2017-11-15 10:06 ` David Miller
2017-11-15 17:41 ` Stephen Hemminger
1 sibling, 1 reply; 7+ messages in thread
From: Greg KH @ 2017-11-15 9:13 UTC (permalink / raw)
To: David Miller; +Cc: stephen, devel, netdev, linux-fsdevel, sthemmin, viro
On Wed, Nov 15, 2017 at 09:58:33AM +0900, David Miller wrote:
> From: Stephen Hemminger <stephen@networkplumber.org>
> Date: Tue, 14 Nov 2017 08:37:13 -0800
>
> > These are both old decrepit protocols that need to be sent
> > to pasture.
>
> These need to go to gregkh and his staging/ tree, not net-next.
I'll gladly take them, as long as you have no objection and I can get an
ack for them.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/2] retire IPX and NCPFS
2017-11-15 9:13 ` Greg KH
@ 2017-11-15 10:06 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-11-15 10:06 UTC (permalink / raw)
To: greg; +Cc: stephen, devel, netdev, linux-fsdevel, sthemmin, viro
From: Greg KH <greg@kroah.com>
Date: Wed, 15 Nov 2017 10:13:18 +0100
> On Wed, Nov 15, 2017 at 09:58:33AM +0900, David Miller wrote:
>> From: Stephen Hemminger <stephen@networkplumber.org>
>> Date: Tue, 14 Nov 2017 08:37:13 -0800
>>
>> > These are both old decrepit protocols that need to be sent
>> > to pasture.
>>
>> These need to go to gregkh and his staging/ tree, not net-next.
>
> I'll gladly take them, as long as you have no objection and I can get an
> ack for them.
No objection:
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/2] retire IPX and NCPFS
2017-11-15 0:58 ` [PATCH net-next v2 0/2] retire IPX and NCPFS David Miller
2017-11-15 9:13 ` Greg KH
@ 2017-11-15 17:41 ` Stephen Hemminger
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2017-11-15 17:41 UTC (permalink / raw)
To: David Miller; +Cc: viro, devel, netdev, linux-fsdevel, sthemmin
On Wed, 15 Nov 2017 09:58:33 +0900 (KST)
David Miller <davem@davemloft.net> wrote:
> From: Stephen Hemminger <stephen@networkplumber.org>
> Date: Tue, 14 Nov 2017 08:37:13 -0800
>
> > These are both old decrepit protocols that need to be sent
> > to pasture.
>
> These need to go to gregkh and his staging/ tree, not net-next.
Ok, just wanted to get acceptance from netdev for moving
^ permalink raw reply [flat|nested] 7+ messages in thread