Re: [leaf-devel] wpa-supplicant on bering 5.01

2014-02-11 Thread Erich Titl
Hi Yves on 11.02.2014 19:41, Yves Blusseau wrote: > ... > > Hi Erich, > you can stash your changes. After that fetch the branch master from the repo > and rebase your work on it: > > git stash > git pull > git stash pop Did that, now tons of conflicts arose, at least it did not abort. git s

Re: [leaf-devel] atheros driver channels bering 5.01

2014-02-11 Thread Erich Titl
Hi KP on 11.02.2014 17:45, KP Kirchdörfer wrote: > Hi Erich; > > Am Dienstag, 11. Februar 2014, 14:09:34 schrieb Erich Titl: >> Hi >> >> I have successfully loaded the driver for my atheros card, but it >> appears there are a few glitches in the reulatory domain field. Some of >> you may remember

Re: [leaf-devel] wpa-supplicant on bering 5.01

2014-02-11 Thread Yves Blusseau
Le 11 févr. 2014 à 16:07, Erich Titl a écrit : > Hi Folks > > it looks like wpa-supplicant is out of date on 5.01 (possibly later too) > > I have successfully built the latest wpasupplicant on my (slightly > invalid) buildenv and would like to contribute it. > > Questions > > - How can I fin

Re: [leaf-devel] atheros driver channels bering 5.01

2014-02-11 Thread KP Kirchdörfer
Hi Erich; Am Dienstag, 11. Februar 2014, 14:09:34 schrieb Erich Titl: > Hi > > I have successfully loaded the driver for my atheros card, but it > appears there are a few glitches in the reulatory domain field. Some of > you may remember the thread > "Wifi on BuC 4.3.1" > > [ 60.288494] WARNIN

Re: [leaf-devel] Git workflow questions

2014-02-11 Thread KP Kirchdörfer
Hi David; Am Montag, 10. Februar 2014, 20:00:16 schrieb David M Brooke: > Hi kp, > > Thanks for the responses. > > On Sat, 2014-02-08 at 00:13 +0100, KP Kirchdörfer wrote: > > Hi David; > > > > Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke: > > > Hi leaf-devel, > > > > > > I've

[leaf-devel] wpa-supplicant on bering 5.01

2014-02-11 Thread Erich Titl
Hi Folks it looks like wpa-supplicant is out of date on 5.01 (possibly later too) I have successfully built the latest wpasupplicant on my (slightly invalid) buildenv and would like to contribute it. Questions - How can I find out where I stand relative to the repo? Do I need to know at all? H

[leaf-devel] atheros driver channels bering 5.01

2014-02-11 Thread Erich Titl
Hi I have successfully loaded the driver for my atheros card, but it appears there are a few glitches in the reulatory domain field. Some of you may remember the thread "Wifi on BuC 4.3.1" [ 60.288494] WARNING: at /opt/buildtool-5/source/i486-unknown-linux-uclibc/linux/linux-3.4/net/wireless/re

Re: [leaf-devel] Git workflow questions

2014-02-11 Thread Yves Blusseau
Le 10 févr. 2014 à 21:00, David M Brooke a écrit : >>> I also have a new Package (vnstat) which I'd like to add. That's not a >>> bug-fix, so should I create my feature branch off "master" rather than >>> "maint"? >> Fork off the new feature branch from maint if you want to add the new package

Re: [leaf-devel] Git workflow questions

2014-02-11 Thread Yves Blusseau
Le 7 févr. 2014 à 22:09, David M Brooke a écrit : > Hi leaf-devel, > Hi David ! > What I did was: > - Created a new local branch (called "trac#93") based on "maint" > - Committed the code change against that new branch > - Merged the bugfix branch back into « maint" (with "--no-ff") You