On 7/24/11 3:02 AM, Hauke Mehrtens wrote: > On 07/24/2011 01:37 AM, Philip Prindeville wrote: >> On 7/22/11 7:07 AM, Peter Wagner wrote: >>> Hi, >>> >>> this patch updates generec and brcm47xx to linux 3.0. >>> runs on brcm47xx like a charm (for a few minutes by now ;) ) >>> >>> /Peter Wagner >>> >>> Signed-off-by: Peter Wagner <tripo...@gmx.at> >> I couldn't actually get it to build: >> > .... >> Applying >> /home/philipp/openwrt2/target/linux/generic/patches-3.0/020-ssb_update.patch >> using plaintext: >> patching file drivers/ssb/driver_chipcommon_pmu.c >> patching file drivers/ssb/driver_gige.c >> patching file drivers/ssb/driver_pcicore.c >> Hunk #4 FAILED at 514. >> 1 out of 4 hunks FAILED -- saving rejects to file >> drivers/ssb/driver_pcicore.c.rej >> patching file drivers/ssb/main.c >> patching file drivers/ssb/pcihost_wrapper.c >> patching file drivers/ssb/scan.c >> Patch failed! Please fix >> /home/philipp/openwrt2/target/linux/generic/patches-3.0/020-ssb_update.patch! >> make[3]: *** >> [/home/philipp/openwrt2/build_dir/toolchain-i386_gcc-linaro_eglibc-2.12/linux-3.0/.prepared] >> Error 1 >> make[3]: Leaving directory `/home/philipp/openwrt2/toolchain/kernel-headers' >> make[2]: *** [toolchain/kernel-headers/prepare] Error 2 >> >> >> I'm trying to vet the OCF version bump for linux-3.0 but I can't do that >> since 3.0 itself isn't in a known/good state. > Hi Philip, > > This patch is already in trunk (see r27722) and for me all the patches > are applying. Are you sure you are using linux-3.0 and not some rc version? > > Hauke
Actually, I had reverted because some patches I had submitted that were still in my tree were conflicting with an update. I'll update and resolve the conflicts. -Philip _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
