What does this mean

What does this mean

[wkcochran123]

runge:~/repository/papers wkcochra$ git checkout
D       medial axis/medial axis.tcp

A search of ^D through user-manual.txt yields nothing.

-- 
View this message in context: http://www.nabble.com/What-does-this-mean-tp24590563p24590563.html
Sent from the git mailing list archive at Nabble.com.

Re: What does this mean

[Michał Kiedrowicz]

wkcochran123 <wkcochran@gmail.com> wrote:

> 
> runge:~/repository/papers wkcochra$ git checkout
> D       medial axis/medial axis.tcp
> 
> A search of ^D through user-manual.txt yields nothing.
> 

'git checkout' command switches to another branch (actually, because
nothing was specified on command line, it doesn't switch at all) and
prints a summary of modified files.

For description of 'D', look for '--name-status' option in man git-diff.
Maybe this what you are looking for.

http://www.kernel.org/pub/software/scm/git/docs/git-diff.html

Re: What does this mean

[Michał Kiedrowicz]

Bill Cochran <wkcochran@gmail.com> wrote:

> Thanks for the quick answer.  I can fix this problem by having a
> clone of the repository on the same machine.  I am just curious if
> the behavior I am seeing is correct.
> 
> > runge:~/repository/papers wkcochra$ git checkout
> > D       medial axis/medial axis.tcp
> 
> 'git checkout' command switches to another branch (actually, because
> > nothing was specified on command line, it doesn't switch at all) and
> > prints a summary of modified files.
> >
> 
> On machine A, I created a directory and file.  This was committed to
> `master.'  The repository was pushed to machine B.  What you are
> looking at is the subsequent checkout on machine B.  Said directory
> and file are medial axis/medial axis.tcp.  The checkout did not
> create the directory nor the file.  Rather, I get the result above.
> 
> git show informs me I am at the correct commit.  git checkout "medial
> axis" fails:
> runge:~/repository/papers wkcochra$ git checkout "medial axis"
> error: pathspec 'medial axis' did not match any file(s) known to git.
> 
> Is this the correct behavior of checkout?
> 
> 
> > For description of 'D', look for '--name-status' option in man
> > git-diff. Maybe this what you are looking for.
> >
> 
> So, this file is deleted, according to the man page of git-diff.
> Interesting that it was never created on machine B.
> 
> 

I think I managed to reproduce your problem. Here is what I did:

> $ git push ../b master
> Counting objects: 4, done.
> Writing objects: 100% (4/4), 283 bytes, done.
> Total 4 (delta 0), reused 0 (delta 0)
> Unpacking objects: 100% (4/4), done.
> warning: updating the current branch
> warning: Updating the currently checked out branch may cause confusion,
> warning: as the index and work tree do not reflect changes that are in HEAD.
> warning: As a result, you may see the changes you just pushed into it
> warning: reverted when you run 'git diff' over there, and you may want
> warning: to run 'git reset --hard' before starting to work to recover.

This seems to be your case. You see a file as deleted, because in another repo
you have created.

> warning: 
> warning: You can set 'receive.denyCurrentBranch' configuration variable to
> warning: 'refuse' in the remote repository to forbid pushing into its
> warning: current branch.
> warning: To allow pushing into the current branch, you can set it to 'ignore';
> warning: but this is not recommended unless you arranged to update its work
> warning: tree to match what you pushed in some other way.
> warning: 
> warning: To squelch this message, you can set it to 'warn'.
> warning: 
> warning: Note that the default will change in a future version of git
> warning: to refuse updating the current branch unless you have the
> warning: configuration variable set to either 'ignore' or 'warn'.
> To ../b
>  * [new branch]      master -> master
> 
> $ cd ../b/
> $ git checkout 
> D	medial axis/medial axis.tcp

what does this mean

[James]

I tried the 2011 03 26 compat-wireless and it gives this error when I
try a scan (it finds some networks but I know there are more).

sudo iw dev wlan0 scan | grep -i ssid

ath: timeout (100000 us) on reg 0x9c20: 0x00000000 & 0x00000001 !=
0x00000001
ath: Could not kill baseband RX

Re: what does this mean

[Mohammed Shafi]

On Sun, Mar 27, 2011 at 7:15 AM, James <bjlockie@lockie.ca> wrote:
> I tried the 2011 03 26 compat-wireless and it gives this error when I
> try a scan (it finds some networks but I know there are more).
>
> sudo iw dev wlan0 scan | grep -i ssid
>
> ath: timeout (100000 us) on reg 0x9c20: 0x00000000 & 0x00000001 !=
> 0x00000001
> ath: Could not kill baseband RX

James, this is a fatal error.

> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: what does this mean

[James]

On 03/27/11 07:53, Mohammed Shafi wrote:
> On Sun, Mar 27, 2011 at 7:15 AM, James <bjlockie@lockie.ca> wrote:
>> I tried the 2011 03 26 compat-wireless and it gives this error when I
>> try a scan (it finds some networks but I know there are more).
>>
>> sudo iw dev wlan0 scan | grep -i ssid
>>
>> ath: timeout (100000 us) on reg 0x9c20: 0x00000000 & 0x00000001 !=
>> 0x00000001
>> ath: Could not kill baseband RX
> James, this is a fatal error.
Is there anyway to increase the timeout or reset the hardware without
rebooting?

Re: what does this mean

[Mohammed Shafi]

On Tue, Mar 29, 2011 at 8:02 AM, James <bjlockie@lockie.ca> wrote:
> On 03/27/11 07:53, Mohammed Shafi wrote:
>> On Sun, Mar 27, 2011 at 7:15 AM, James <bjlockie@lockie.ca> wrote:
>>> I tried the 2011 03 26 compat-wireless and it gives this error when I
>>> try a scan (it finds some networks but I know there are more).
>>>
>>> sudo iw dev wlan0 scan | grep -i ssid
>>>
>>> ath: timeout (100000 us) on reg 0x9c20: 0x00000000 & 0x00000001 !=
>>> 0x00000001
>>> ath: Could not kill baseband RX
>> James, this is a fatal error.
> Is there anyway to increase the timeout or reset the hardware without
> rebooting?

this is the default timeout in hw.h
#define AH_WAIT_TIMEOUT             100000 /* (us) */

may be you can try increasing the timeout specifically for this

diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 4361704..6d528ba 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -976,7 +976,7 @@ static bool ar5008_hw_rfbus_req(struct ath_hw *ah)
 {
        REG_WRITE(ah, AR_PHY_RFBUS_REQ, AR_PHY_RFBUS_REQ_EN);
        return ath9k_hw_wait(ah, AR_PHY_RFBUS_GRANT, AR_PHY_RFBUS_GRANT_EN,
-                          AR_PHY_RFBUS_GRANT_EN, AH_WAIT_TIMEOUT);
+                          AR_PHY_RFBUS_GRANT_EN, 1000000);
 }

and this is also there in ar9003_phy.c

> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>