Resend previous incorrecly formatted patches

Resending patches, these have now been formatted with:

git format-patch -k -M

Tested with git am sucessfully on a local tree

Mark Einon (19):
staging: et131x: Put all .c files into one big file
staging: et131x: Move function declarations from et131x.h to et131x.c
staging: et131x: Move non-register defines from et131x.h to et131x.c
staging: et131x: move et1310_address_map.h contents into et131x.h
staging: et131x: move et1310_phy.h contents into et131x.h
staging: et131x: move et131x_adapter.h contents into et131x.c
staging: et131x: move et131x_defs.h contents into et131x.c
staging: et131x: move et1310_rx.h contents into et131x.c
staging: et131x: move et1310_tx.h contents into et131x.c
staging: et131x: Update TODO list - remove 'put driver into single file'
staging: et131x: Moving two extern inline functions to .c file
staging: et131x: Make rx_ring.fbr{0,1} share a common structure
staging: et131x: Fix issues when USE_FBR0 is not defined
staging: et131x: use dma_alloc... instead of pci_alloc...
staging: et131x: Match dma_alloc_ calls with dma_free_ calls
staging: et131x: Tidy up PCI device table definition
staging: et131x: on transmit, stop the queue if the next packet will fail
staging: et131x: Convert rest of pci memory management to dma api
staging: et131x: Remove unused defines

 drivers/staging/et131x/Makefile             |   11 -
 drivers/staging/et131x/README               |    5 -
 drivers/staging/et131x/et1310_address_map.h | 1436 -------
 drivers/staging/et131x/et1310_eeprom.c      |  408 --
 drivers/staging/et131x/et1310_mac.c         |  654 ----
 drivers/staging/et131x/et1310_phy.c         |  375 --
 drivers/staging/et131x/et1310_phy.h         |  292 --
 drivers/staging/et131x/et1310_pm.c          |  204 -
 drivers/staging/et131x/et1310_rx.c          | 1160 ------
 drivers/staging/et131x/et1310_rx.h          |  245 --
 drivers/staging/et131x/et1310_tx.c          |  793 ----
 drivers/staging/et131x/et1310_tx.h          |  150 -
 drivers/staging/et131x/et131x.c             | 5577 +++++++++++++++++++++++++++
 drivers/staging/et131x/et131x.h             | 1718 ++++++++-
 drivers/staging/et131x/et131x_adapter.h     |  218 --
 drivers/staging/et131x/et131x_defs.h        |  128 -
 drivers/staging/et131x/et131x_ethtool.c     |  201 -
 drivers/staging/et131x/et131x_initpci.c     |  950 -----
 drivers/staging/et131x/et131x_isr.c         |  442 ---
 drivers/staging/et131x/et131x_netdev.c      |  662 ----
 20 files changed, 7192 insertions(+), 8437 deletions(-)

Created one big .c file for the driver, moving the contents of all driver .c files into it.

---
 drivers/staging/et131x/Makefile         |   11 -
 drivers/staging/et131x/et1310_eeprom.c  |  408 ---
 drivers/staging/et131x/et1310_mac.c     |  654 ----
 drivers/staging/et131x/et1310_phy.c     |  375 ---
 drivers/staging/et131x/et1310_pm.c      |  204 --
 drivers/staging/et131x/et1310_rx.c      | 1160 -------
 drivers/staging/et131x/et1310_tx.c      |  793 -----
 drivers/staging/et131x/et131x.c         | 5042 +++++++++++++++++++++++++++++++
 drivers/staging/et131x/et131x.h         |   62 +-
 drivers/staging/et131x/et131x_ethtool.c |  201 --
 drivers/staging/et131x/et131x_initpci.c |  950 ------
 drivers/staging/et131x/et131x_isr.c     |  442 ---
 drivers/staging/et131x/et131x_netdev.c  |  662 ----
 13 files changed, 5102 insertions(+), 5862 deletions(-)
 delete mode 100644 drivers/staging/et131x/et1310_eeprom.c
 delete mode 100644 drivers/staging/et131x/et1310_mac.c
 delete mode 100644 drivers/staging/et131x/et1310_phy.c
 delete mode 100644 drivers/staging/et131x/et1310_pm.c
 delete mode 100644 drivers/staging/et131x/et1310_rx.c
 delete mode 100644 drivers/staging/et131x/et1310_tx.c
 create mode 100644 drivers/staging/et131x/et131x.c
 delete mode 100644 drivers/staging/et131x/et131x_ethtool.c
 delete mode 100644 drivers/staging/et131x/et131x_initpci.c
 delete mode 100644 drivers/staging/et131x/et131x_isr.c
 delete mode 100644 drivers/staging/et131x/et131x_netdev.c

index 5ea0272..027ff94 100644
@@ -3,14 +3,3 @@
 #
 
 obj-$(CONFIG_ET131X) += et131x.o
-
-et131x-y :=	et1310_eeprom.o \
-		et1310_mac.o \
-		et1310_phy.o \
-		et1310_pm.o \
-		et1310_rx.o \
-		et1310_tx.o \
-		et131x_initpci.o \
-		et131x_ethtool.o \
-		et131x_isr.o \
-		et131x_netdev.o

1.7.6.4

Part of the diff is not shown here. View the raw message.

But when you sent them, they did not have any [xx/yy] markings on them so I have no idea what order to apply them in.

Did you use git send-email to send these? If not, why not?

We'll get this right one of these tries :)

greg k-h

Gahhh, sorry. I just blindly used the git format-patch line you provided, and the -k option removes the [xx/yy] markings. git send-email was used to send them.

I will send the patches once more to you with the markings. I'll avoid spamming the mailing lists with them once more.

Thanks for your patience,

Mark