On 23 August 2011 22:03, Greg KH <gregkh@xxxxxxx> wrote: > On Tue, Aug 23, 2011 at 09:43:31PM +0100, Mark Einon wrote: >> On 23 August 2011 19:50, Greg KH <greg@xxxxxxxxx> wrote: >> > On Tue, Aug 02, 2011 at 10:47:01PM +0100, Mark Einon wrote: >> >> When a tx timeout occured, et131x_tx_timeout closed and re-opened the device to fix. >> >> As et131x_close called free_irq(), bad things ensued (see warning trace below), namely a >> >> storm of errors and warnings. >> >> Fixed by replacing the close() and open() calls with just the relevant functions previously >> >> called from these. >> >> Verified on an ET-1310 device. >> >> >> >> Signed-off-by: Mark Einon <mark.einon@xxxxxxxxx> >> > >> > This patch breaks the build :( >> > >> > Care to resend this one, and any other patch you have sent me but I >> > didn't apply yet, again, as I have now applied all et131x patches in my >> > queue. >> >> Hi Greg, >> >> I seem to have some difficulty updating my staging-next branch at the >> moment, this method worked a few days ago. Am I doing something >> idiotic, or is the issue with the remote? >> The file refs/heads/staging-next contains >> 4024bc73b1d1d8f82518b67b0996cb7b870dd1d4, which git doesn't seem to >> like. >> >> [mark@msilap staging-2.6]$ git checkout staging-next >> Already on 'staging-next' >> [mark@msilap staging-2.6]$ git pull >> remote: error: refs/heads/staging-next does not point to a valid object! >> remote: Counting objects: 21, done. >> remote: Compressing objects: 100% (12/12), done. >> remote: Total 14 (delta 12), reused 2 (delta 2) >> Unpacking objects: 100% (14/14), done. >> >From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 >> fcb8ce5..20cc799 staging-linus -> origin/staging-linus >> Your configuration specifies to merge with the ref 'staging-next' >> from the remote, but no such ref was fetched. > > That's odd. > > First, back up your patches somewhere. > > Then try deleting the local branch: > git checkout master > git branch -D staging-next > and then re-creating it: > git pull > git checkout -t -b staging-next origin/staging-next > > And then work on adding your patches back. > > See if that works. I tried cloning a new repo, with the same error message. Five minutes later, it's now all working again. I'm putting it down to some sort of server sync issue? Cheers, Mark > > thanks, > > greg k-h > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
