Hi Linus, On Tue, Mar 05, 2019 at 12:29:53AM +0000, Paul Burton wrote: > The following changes since commit 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8: > > Linux 5.0-rc2 (2019-01-14 10:41:12 +1200) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.1 > > for you to fetch changes up to aeb669d41ffabb91b1542f1f802cb12a989fced0: > > MIPS: lantiq: Remove separate GPHY Firmware loader (2019-02-25 14:17:10 > -0800)
D'oh, I forgot to mention that you'll see a few conflicts when merging
due to fixes that went into v5.0. The correct resolutions are:
- Delete arch/mips/ath79/dev-spi.h as done in mips_5.1.
- Keep the mips_5.1 version of arch/mips/include/asm/pgtable.h (the
version using cmpxchg).
- Keep both hunks of code added to arch/mips/include/asm/barrier.h.
Thanks,
Paul
signature.asc
Description: PGP signature
