Zen-Sources: 2.6.26-rc3-zen0

Message

rmh3093 · Post by **rmh3093** » Sat May 17, 2008 8:44 pm

well 2.6.26-rc2-zen2 is out now, enjoy

aircrack
aufs
bfq
btrfs
cko
custom-cflags
daconfig
eeepc
expose-vmsplit
ext4
fbcondecor
fujitsu-laptop-extras
gspca
hz-kconfig
l7filter
linux-uvc
localversion
mactel
madwifi
march-native
master
mm-patches
phc-acpi-cpufreq
reiser4
squashfs
strip-debug
swap-prefetch
toshiba_acpi
tp_smapi
tuxonice
wireless-testing
zen-logo

Eckos · Post by **Eckos** » Sat May 17, 2008 9:23 pm

i'm liking zen-sources. too bad i never had it to use reiser4 from when i do a vanilla install. Too bad ext4 progs doesn't exist yet to use that. Also I haven't really noticed any difference from the normal kernel. except the reiser4 patch.

rmh3093 · Post by **rmh3093** » Sat May 17, 2008 10:30 pm

Eckos wrote:i'm liking zen-sources. too bad i never had it to use reiser4 from when i do a vanilla install. Too bad ext4 progs doesn't exist yet to use that. Also I haven't really noticed any difference from the normal kernel. except the reiser4 patch.

there isnt anything we can do to make it faster really, most patches have to do with hardware support

dodo1122 · Post by **dodo1122** » Sun May 18, 2008 10:54 am

Eckos wrote:i'm liking zen-sources. too bad i never had it to use reiser4 from when i do a vanilla install. Too bad ext4 progs doesn't exist yet to use that. Also I haven't really noticed any difference from the normal kernel. except the reiser4 patch.

In zen-overlay there is e2fsprogs live ebuild, which supports ext4. Theres even fsck.ext4 and mkfs.ext4 there.

dodo

Eckos · Post by **Eckos** » Sun May 18, 2008 3:23 pm

rmh3093 wrote:
Eckos wrote:i'm liking zen-sources. too bad i never had it to use reiser4 from when i do a vanilla install. Too bad ext4 progs doesn't exist yet to use that. Also I haven't really noticed any difference from the normal kernel. except the reiser4 patch.
there isnt anything we can do to make it faster really, most patches have to do with hardware support

Oh I know, I was just saying. xD

dodo1122 · Post by **dodo1122** » Sun May 18, 2008 6:19 pm

nvidia-drivers-169.12 ebuild with a patch to make it work with .26-rc kernels is in zen overlay since like half an hour.

dodo

buubuu · Post by **buubuu** » Sun May 18, 2008 10:18 pm

bash-3.1# sensors
Can't access procfs/sysfs file
Kernel interface access error
For 2.6 kernels, make sure you have mounted sysfs and libsensors
was compiled with sysfs support!

is the problem related to this?

tranquilcool · Post by **tranquilcool** » Mon May 19, 2008 12:00 pm

You are in the middle of a conflicted merge

any solution?

netguy · Post by **netguy** » Mon May 19, 2008 12:31 pm

tranquilcool wrote:You are in the middle of a conflicted merge

any solution?[/quote

I got such issue recently too,what I did is delete kernel directory and git clone again.

tranquilcool · Post by **tranquilcool** » Mon May 19, 2008 1:29 pm

netguy wrote:
tranquilcool wrote:You are in the middle of a conflicted merge

any solution?[/quote

I got such issue recently too,what I did is delete kernel directory and git clone again.
yeah i know but it's a pain in the backside.

unK · Post by **unK** » Mon May 19, 2008 1:53 pm

tranquilcool wrote:You are in the middle of a conflicted merge

any solution?

http://forums.gentoo.org/viewtopic-p-49 ... ml#4943768

tranquilcool · Post by **tranquilcool** » Mon May 19, 2008 1:55 pm

unK wrote:
tranquilcool wrote:You are in the middle of a conflicted merge

any solution?
http://forums.gentoo.org/viewtopic-p-49 ... ml#4943768

that didn't fix it.

mroconnor · Post by **mroconnor** » Mon May 19, 2008 2:13 pm

Compiling pull from early this AM. Will report back on HDAPS. Thanks.

mroconnor · Post by **mroconnor** » Mon May 19, 2008 2:32 pm

HDAPS patch looks good.

/me pokes rmh for genetic lib work!

rmh3093 · Post by **rmh3093** » Mon May 19, 2008 4:52 pm

mroconnor wrote:HDAPS patch looks good.

/me pokes rmh for genetic lib work!

im not playing with genetics till at least June after I get back from Mexico

...and then genetics will have to compete with my thesis work and me programming my new car computer interface

mroconnor · Post by **mroconnor** » Mon May 19, 2008 5:18 pm

fine! maybe some cheap mexican beer will get you in the mode to f' around with it!

What's the thesis on? How can it compete with genetic libs?!

gimpel · Post by **gimpel** » Mon May 19, 2008 5:21 pm

tranquilcool wrote:
unK wrote:
tranquilcool wrote:You are in the middle of a conflicted merge

any solution?
http://forums.gentoo.org/viewtopic-p-49 ... ml#4943768
that didn't fix it.

Code: Select all

git reset --hard
git checkout v2.6.26-rc3-zen0
git-branch -D master
git branch master origin/master
git checkout master

no idea if there is a simpler way, but it works.

rmh3093 · Post by **rmh3093** » Mon May 19, 2008 5:56 pm

gimpel wrote:
tranquilcool wrote:
unK wrote:
tranquilcool wrote:You are in the middle of a conflicted merge

any solution?
http://forums.gentoo.org/viewtopic-p-49 ... ml#4943768
that didn't fix it.
Code: Select all
git reset --hard
git checkout v2.6.26-rc3-zen0
git-branch -D master
git branch master origin/master
git checkout master
no idea if there is a simpler way, but it works.

yeah i did some stupid things to master yesterday.... when that happens try this:

Code: Select all

git reset --hard
git branch -M master master-bad
git checkout master origin/master
git branch -D master-bad

rmh3093 · Post by **rmh3093** » Mon May 19, 2008 5:57 pm

mroconnor wrote:fine! maybe some cheap mexican beer will get you in the mode to f' around with it!

What's the thesis on? How can it compete with genetic libs?!

Dos Equis >>> Corona

mroconnor · Post by **mroconnor** » Mon May 19, 2008 6:47 pm

Excellent choice, but I might add that Sol and Pacifico are welcome changes from Corona. Cheers.

rmh3093 · Post by **rmh3093** » Mon May 19, 2008 7:06 pm

mroconnor wrote:Excellent choice, but I might add that Sol and Pacifico are welcome changes from Corona. Cheers.

Yeah i've had Sol.... but I can get Dos Equis / Sol here in NY, I am going to be abusing the all inclusive top shelf liquor

mroconnor · Post by **mroconnor** » Mon May 19, 2008 10:13 pm

What the hell did I do to get this

Code: Select all

cosmo kernel # git-pull
Auto-merged MAINTAINERS
Auto-merged Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merged block/blk-core.c
Auto-merged block/blk-settings.c
Auto-merged drivers/acpi/Kconfig
Auto-merged drivers/acpi/Makefile
Auto-merged drivers/char/Kconfig
Auto-merged drivers/misc/Kconfig
Auto-merged drivers/net/wireless/Kconfig
Auto-merged drivers/net/wireless/Makefile
CONFLICT (content): Merge conflict in drivers/net/wireless/Makefile
Auto-merged drivers/net/wireless/atmel.c
Auto-merged drivers/net/wireless/zd1211rw/zd_mac.c
Auto-merged drivers/video/Kconfig
Auto-merged drivers/video/logo/Kconfig
CONFLICT (content): Merge conflict in drivers/video/logo/Kconfig
Auto-merged drivers/video/logo/Makefile
CONFLICT (content): Merge conflict in drivers/video/logo/Makefile
Auto-merged drivers/video/logo/logo.c
CONFLICT (content): Merge conflict in drivers/video/logo/logo.c
Auto-merged fs/btrfs/Makefile
CONFLICT (add/add): Merge conflict in fs/btrfs/Makefile
Auto-merged fs/btrfs/xattr.c
CONFLICT (add/add): Merge conflict in fs/btrfs/xattr.c
Auto-merged include/linux/ide.h
Auto-merged init/Kconfig
CONFLICT (content): Merge conflict in init/Kconfig
Auto-merged mm/filemap.c
Auto-merged net/ieee80211/ieee80211_tx.c
Automatic merge failed; fix conflicts and then commit the result.

Help?!

rmh3093 · Post by **rmh3093** » Mon May 19, 2008 10:22 pm

mroconnor wrote:What the hell did I do to get this

Code: Select all

cosmo kernel # git-pull
Auto-merged MAINTAINERS
Auto-merged Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merged block/blk-core.c
Auto-merged block/blk-settings.c
Auto-merged drivers/acpi/Kconfig
Auto-merged drivers/acpi/Makefile
Auto-merged drivers/char/Kconfig
Auto-merged drivers/misc/Kconfig
Auto-merged drivers/net/wireless/Kconfig
Auto-merged drivers/net/wireless/Makefile
CONFLICT (content): Merge conflict in drivers/net/wireless/Makefile
Auto-merged drivers/net/wireless/atmel.c
Auto-merged drivers/net/wireless/zd1211rw/zd_mac.c
Auto-merged drivers/video/Kconfig
Auto-merged drivers/video/logo/Kconfig
CONFLICT (content): Merge conflict in drivers/video/logo/Kconfig
Auto-merged drivers/video/logo/Makefile
CONFLICT (content): Merge conflict in drivers/video/logo/Makefile
Auto-merged drivers/video/logo/logo.c
CONFLICT (content): Merge conflict in drivers/video/logo/logo.c
Auto-merged fs/btrfs/Makefile
CONFLICT (add/add): Merge conflict in fs/btrfs/Makefile
Auto-merged fs/btrfs/xattr.c
CONFLICT (add/add): Merge conflict in fs/btrfs/xattr.c
Auto-merged include/linux/ide.h
Auto-merged init/Kconfig
CONFLICT (content): Merge conflict in init/Kconfig
Auto-merged mm/filemap.c
Auto-merged net/ieee80211/ieee80211_tx.c
Automatic merge failed; fix conflicts and then commit the result.

Help?!

the server was going slow last night and I didnt want to trash the current master so i moved renamed the master branch for the time being and push a new master which some of you checked before I could push the new master over the old master.....(idk if that made sense to you)

anyway, run"git fetch" to get the latests refs, then "git reset --hard; git clean -f" to make sure you have no cruft left around, then since you cant delete the branch you are currently on run "git branch -M master broken; git checkout -b master origin/master; git branch -D broken"

mroconnor · Post by **mroconnor** » Tue May 20, 2008 4:51 pm

Sounds good rmh, I'll run those commands. Will git-http-fetch work reliably? I have no git access behind my FW.

mroconnor · Post by **mroconnor** » Tue May 20, 2008 5:02 pm

Actually I guess it wont because I only see [url]git://zen-sources.org/zen/kernel.git[/url] and no http://.

I will have to wait until tonight.

I dont know what is more addicting my blackberry or zen-sources.