Commit 7d5b2cbe authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

comedi: remove editor modelines and cruft (again) 

Commit fa60ce2c ("treewide: remove editor modelines and cruft")
is different from what I submitted.

My original patch [1] did treewide cleanups including the comedi driver.

Unfortunately, commit 8ffdff6a ("staging: comedi: move out of staging
directory") moved drivers/staging/comedi/ to drivers/comedi/ before my
patch landed on Linus' tree from akpm tree.

If Andrew Morton had used Git, 'git merge' would have resolved such file
moves properly without any manual intervention.

Patches in akpm tree often get broken in his quilt workflows, and then
people end up with sending fixup patches.

[1] https://lkml.kernel.org/r/20210324054457.1477489-1-masahiroy@kernel.org



Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210510063450.412055-1-masahiroy@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6efb943b

drivers/comedi/drivers/ni_routes.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/* vim: set ts=8 sw=8 noet tw=80 nowrap: */

/*

 *  comedi/drivers/ni_routes.c

 *  Route information for NI boards.

drivers/comedi/drivers/ni_routes.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/* vim: set ts=8 sw=8 noet tw=80 nowrap: */

/*

 *  comedi/drivers/ni_routes.h

 *  Route information for NI boards.

drivers/comedi/drivers/ni_routing/ni_device_routes.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/* vim: set ts=8 sw=8 noet tw=80 nowrap: */

/*

 *  comedi/drivers/ni_routing/ni_device_routes.c

 *  List of valid routes for specific NI boards.

drivers/comedi/drivers/ni_routing/ni_device_routes.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/* vim: set ts=8 sw=8 noet tw=80 nowrap: */

/*

 *  comedi/drivers/ni_routing/ni_device_routes.c

 *  List of valid routes for specific NI boards.

drivers/comedi/drivers/ni_routing/ni_device_routes/all.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/* vim: set ts=8 sw=8 noet tw=80 nowrap: */

/*

 *  comedi/drivers/ni_routing/ni_device_routes/all.h

 *  List of valid routes for specific NI boards.