Re: tidspbridge build fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Tue, Sep 25, 2012 at 12:39 PM, Selso LIBERADO <sli@xxxxxxxxxxxxxxx> wrote:
> Hi !
>
> Here what's happening when applying the patch :
>
> sli@SLI-V420:~/developpement/INTERNE/BEAGLEBOARD/logiciel/linux-omap$ git apply
> --check ../../archive/10-17-staging-tidspbridge-Prepare-for-irqs.h-removal.patch
> error: patch failed: drivers/staging/tidspbridge/core/wdt.c:25
> error: drivers/staging/tidspbridge/core/wdt.c: patch does not apply

Yes, got the same had to rework the patch to apply.

If you have the time, you could try:

git am --3way <patch>

Then resolve the conflicts[1].

> newbie question : Where is the staging-next rep ?

http://git.kernel.org/?p=linux/kernel/git/gregkh/staging.git;a=summary

Regards,

Omar

---
[1] http://www.kernel.org/pub/software/scm/git/docs/v1.7.3/user-manual.html#resolving-a-merge
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux