Skip to contentSkip to conversation

MIPS fixes for 4.16-rc7

GIT PULL James Hogan 2 participants 3 messages Mar 23, 2018 MIPS

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull the following MIPS fixes for 4.16-rc7.

Thanks
James

The following changes since commit 0c8efd610b58cb23cefdfa12015799079aef94ae:

Linux 4.16-rc5 (2018-03-11 17:25:09 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git tags/mips_fixes_4.16_5

for you to fetch changes up to a63d706ea719190a79a6c769e898f70680044d3e:

MIPS: ralink: Fix booting on MT7621 (2018-03-22 00:06:30 +0000)

----------------------------------------------------------------
MIPS fixes for 4.16-rc7

Another miscellaneous pile of MIPS fixes for 4.16:

- lantiq: fixes for clocks and Amazon SE (4.14)

- ralink: fix booting on MT7621 (4.5)

- ralink: fix halt (3.9)

----------------------------------------------------------------
Mathias Kresin (3):
MIPS: lantiq: Fix Danube USB clock
MIPS: lantiq: Enable AHB Bus for USB
MIPS: lantiq: ase: Enable MFD_SYSCON

NeilBrown (2):
MIPS: ralink: Remove ralink_halt()
MIPS: ralink: Fix booting on MT7621

 arch/mips/lantiq/Kconfig        |  2 ++
 arch/mips/lantiq/xway/sysctrl.c |  6 ++---
 arch/mips/ralink/mt7621.c       | 50 +++++++++++++++++++++--------------------
 arch/mips/ralink/reset.c        |  7 ------
 4 files changed, 31 insertions(+), 34 deletions(-)
#1 lore raw
Quoted 6 lines · James Hogan
 arch/mips/lantiq/Kconfig        |  2 ++
 arch/mips/lantiq/xway/sysctrl.c |  6 ++---
 arch/mips/ralink/mt7621.c       | 50 +++++++++++++++++++++--------------------
 arch/mips/ralink/reset.c        |  7 ------
 4 files changed, 31 insertions(+), 34 deletions(-)

Odd. This didn't match for me. It turns out that's because you have the patience diff enabled.

Normally the patience diff generates moire legible diffs, but in this case the default diff actually seems better.

You don't have to do anything about your config, I realize that some people and projects prefer patience-dff. I just found it interesting how *completely* different the diffs look. Normally the differences are subtler.

Linus

#2 lore raw
Quoted 11 lines · Linus Torvalds
Quoted 6 lines · James Hogan
 arch/mips/lantiq/Kconfig        |  2 ++
 arch/mips/lantiq/xway/sysctrl.c |  6 ++---
 arch/mips/ralink/mt7621.c       | 50 +++++++++++++++++++++--------------------
 arch/mips/ralink/reset.c        |  7 ------
 4 files changed, 31 insertions(+), 34 deletions(-)

Odd. This didn't match for me. It turns out that's because you have the patience diff enabled.

Quoted 7 lines

Normally the patience diff generates moire legible diffs, but in this case the default diff actually seems better.

You don't have to do anything about your config, I realize that some people and projects prefer patience-dff. I just found it interesting how *completely* different the diffs look. Normally the differences are subtler.

Indeed I do have patience enabled from long ago when the default diff was probably showing some change unintuitively.

The only nice thing I suppose is that it emphasises the added __sync() and its choice of code to show as moved is essentially unchanged, but then again it doesn't match so closely how the author has described the change...

Cheers
James