On Wed, 2011-08-24 at 17:42 -0700, Henry Ptasinski wrote: > On Wed, Aug 24, 2011 at 04:54:28PM -0700, Joe Perches wrote: > > On Wed, 2011-08-24 at 16:17 -0700, Henry Ptasinski wrote: > > > Augh. I included the wrong link. Correct link: > > > http://linuxwireless.org/en/users/Drivers/brcm80211?action=AttachFile&do=get&target=0001-wireless-testing-add-brcm80211-v2.patch > > Can't you post the patch with git format-patch -M instead? > This patch drops in a new copy of all the files, as there's been significant > change since the last time staging-next and wireless-testing were in sync. > (Deleting the existing files from staging will be a separate step.) > > I can generate a two-patch series instead: one to catch up wireless-testing > with all the changes that have been applied to the brcm80211 drivers in > staging, and then a second patch with a 'git mv' plus necessary > Kconfig/Makefile changes. The first patch would still be quite large, but I'm > ok with either approach. I think that's the better approach, though I wonder why you need to update wireless-testing at all. Can't you do a delete from wireless-testing and then a move from staging? _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel