Hi Ralf, You seem to have mucked up your tree badly overnight: Fetching it produced this: remote: Counting objects: 358824, done. remote: Compressing objects: 100% (81248/81248), done. remote: Total 350365 (delta 306957), reused 299661 (delta 267902) Receiving objects: 100% (350365/350365), 131.26 MiB | 700 KiB/s, done. Resolving deltas: 100% (306957/306957), completed with 5669 local objects. From git://git.linux-mips.org/pub/scm/ralf/upstream-sfr + 6eac6e6...eb35a29 mips-for-linux-next -> mips/mips-for-linux-next (forced update) It seems to have an enormous number of back merges in it (which Linus will complain about) and old versions of patches that have been merged by Linus after being rebased. It looks like you have the complete history of MIPS development in there :-( It looks like (maybe) the mti-next branch of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill that you merged was based on the wrong thing. I can't use that. I will use the mips tree from yesterday. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpOOrI8WBzVZ.pgp
Description: PGP signature
