Re: [patch 8/8 2.5] e1000 - White space changes, driver version number update and others

[Jeff Garzik <jgarzik@xxxxxxxxx>]

> @@ -386,10 +386,10 @@ e1000_probe(struct pci_dev *pdev,
>         if((err = pci_enable_device(pdev)))
>                 return err;
>  
> -	if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
> +       if(!(err = pci_set_dma_mask(pdev, PCI_DMA_64BIT))) {
>                 pci_using_dac = 1;
>         } else {
> -               if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
> +               if((err = pci_set_dma_mask(pdev, PCI_DMA_32BIT))) {
>                         E1000_ERR("No usable DMA configuration, aborting\n");
>                         return err;
>                 }
Applied patches 1-2 and patches 4-7 to 2.6.x.

Patch #8 (quoted above) is rejected because DMA_..BIT_MASK is the 
preferred method for 2.6.x kernels.  The above patch is a regression.
Patch #3 is rejected because of an email problem:
> bk import -tpatch -CR -ye1000 -  Fix MODULE_PARM, module_param and 
> /tmp/patch25004 .
> patch: **** malformed patch at line 62:         }