| Message ID | 20190717152545.bhdnhjdf2tlhuv3o@pburton-laptop (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [GIT,PULL] MIPS changes | expand |
On Wed, Jul 17, 2019 at 8:25 AM Paul Burton <paul.burton@mips.com> wrote: > > Documentation/process/license-rules.rst suggests to me that the version > in the MIPS tree is correct in terms of license name ("GPL-2.0" without > the "-only" suffix) whilst the version in master is correct in terms of > comment style ("/* */" rather than "//"). It's actually license-rules.rst that just hasn't been updated. The "GPL-.2.0" and "GPL-2.0+" naming was considered too terse, so the modern spdx tag suggestions are "GPL-2.0-only" and "GPL-2.0-or-later". The full list of all spdx license tags (many of which aren't relevant for the kernel, of course) can be found at https://spdx.org/licenses/ in case you care. Linus
The pull request you sent on Wed, 17 Jul 2019 15:25:47 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fa121bb3fed6313b1f0af23952301e06cf6d32ed
Thank you!
diff --cc arch/mips/include/asm/mach-ralink/pinmux.h index e54d4e1533b4,33647f796140..06ff9b17e42e --- a/arch/mips/include/asm/mach-ralink/pinmux.h
Hi Linus, Here are the main MIPS changes for v5.3, a light batch this time around but significant improvements for certain systems. Please pull. There's one minor conflict in arch/mips/include/asm/mach-ralink/pinmux.h when merging with current master. Commit 1d0ea0692ae3 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 332") in master & commit 017105478bb5 ("MIPS: ralink: Switch pinmux.h to SPDX header") from the MIPS tree both add the SPDX header but a little differently in terms of comment style & license name. Reading Documentation/process/license-rules.rst suggests to me that the version in the MIPS tree is correct in terms of license name ("GPL-2.0" without the "-only" suffix) whilst the version in master is correct in terms of comment style ("/* */" rather than "//"). That would make the correct resolution something like this: +++ b/arch/mips/include/asm/mach-ralink/pinmux.h @@@ -1,6 -1,5 +1,5 @@@ - /* SPDX-License-Identifier: GPL-2.0-only */ -// SPDX-License-Identifier: GPL-2.0 ++/* SPDX-License-Identifier: GPL-2.0 */ /* - * * Copyright (C) 2012 John Crispin <john@phrozen.org> */ Thanks, Paul The following changes since commit cd6c84d8f0cdc911df435bb075ba22ce3c605b07: Linux 5.2-rc2 (2019-05-26 16:49:19 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.3 for you to fetch changes up to e5793cd1b5fedb39337cfa62251a25030f526e56: MIPS: fix some more fall through errors in arch/mips (2019-07-16 12:40:16 +0100) ---------------------------------------------------------------- The main MIPS changes for a pretty light v5.3 cycle, including: - Removal of readq & writeq for MIPS32 kernels where they would simply BUG() anyway, allowing drivers or other code that #ifdefs on their presence to work properly. - Improvements for Ingenic JZ4740 systems, including support for the external memory controller & pinmuxing fixes for qi_lb60/NanoNote systems. - Improvements for Lantiq systems, in particular around SMP & IPIs. - DT updates for ralink/MediaTek MT7628a systems to probe & configure a bunch more devices. - Miscellaneous cleanups & build fixes. ---------------------------------------------------------------- Anshuman Khandual (1): mips/kprobes: Export kprobe_fault_handler() Geert Uytterhoeven (2): memory: jz4780-nemc: Grammar s/the its/its/ MIPS: ftrace: Reword prepare_ftrace_return() comment block Krzysztof Kozlowski (2): MIPS: config: Remove left-over BACKLIGHT_LCD_SUPPORT MIPS: configs: Remove useless UEVENT_HELPER_PATH Lubomir Rintel (1): MIPS: ralink: Switch pinmux.h to SPDX header Masahiro Yamada (1): MIPS: replace MBIT_ULL() with BIT_ULL() Paul Burton (1): FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h Paul Cercueil (6): MIPS: lb60: Fix pin mappings memory: Kconfig: Drop dependency on MACH_JZ4780 for jz4780 dt-bindings: memory: jz4780: Add compatible string for JZ4740 SoC memory: jz4780_nemc: Add support for the JZ4740 memory: jz4780-nemc: Reduce size of const array MAINTAINERS: Add myself as Ingenic SoCs maintainer Petr Cvek (7): MIPS: lantiq: Move macro directly to iomem function MIPS: lantiq: Change variables to the same type as the source MIPS: lantiq: Fix attributes of of_device_id structure MIPS: lantiq: Remove unused macros MIPS: lantiq: Fix bitfield masking MIPS: lantiq: Shorten register names, remove unused macros MIPS: lantiq: Add SMP support for lantiq interrupt controller Serge Semin (1): mips: Remove q-accessors from non-64bit platforms Stefan Roese (6): MIPS: ralink: mt7628a.dtsi: Add SPDX GPL-2.0 license identifier MIPS: ralink: mt7628a.dtsi: Add pinmux DT node MIPS: ralink: mt7628a.dtsi: Add pinctrl DT properties to the UART nodes MIPS: ralink: mt7628a.dtsi: Add GPIO controller DT node MIPS: ralink: mt7628a.dtsi: Add SPI controller DT node MIPS: ralink: mt7628a.dtsi: Add watchdog controller DT node Stephen Rothwell (2): MIPS: perf events: handle switch statement falling through warnings MIPS: fix some more fall through errors in arch/mips .../memory-controllers/ingenic,jz4780-nemc.txt | 1 + MAINTAINERS | 27 ++++ arch/mips/ar7/setup.c | 1 + arch/mips/ath79/setup.c | 2 +- arch/mips/bcm63xx/dev-flash.c | 1 + arch/mips/boot/dts/ralink/mt7628a.dtsi | 148 ++++++++++++++++- arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- arch/mips/configs/ar7_defconfig | 1 - arch/mips/configs/ath25_defconfig | 1 - arch/mips/configs/ath79_defconfig | 1 - arch/mips/configs/bcm63xx_defconfig | 1 - arch/mips/configs/bigsur_defconfig | 1 - arch/mips/configs/bmips_be_defconfig | 1 - arch/mips/configs/bmips_stb_defconfig | 1 - arch/mips/configs/cavium_octeon_defconfig | 1 - arch/mips/configs/ci20_defconfig | 1 - arch/mips/configs/cobalt_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/gpr_defconfig | 1 - arch/mips/configs/ip27_defconfig | 1 - arch/mips/configs/ip32_defconfig | 1 - arch/mips/configs/lemote2f_defconfig | 2 - arch/mips/configs/loongson1b_defconfig | 1 - arch/mips/configs/loongson1c_defconfig | 1 - arch/mips/configs/loongson3_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/malta_kvm_guest_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/mips/configs/mips_paravirt_defconfig | 1 - arch/mips/configs/omega2p_defconfig | 1 - arch/mips/configs/pistachio_defconfig | 1 - arch/mips/configs/pnx8335_stb225_defconfig | 1 - arch/mips/configs/qi_lb60_defconfig | 2 - arch/mips/configs/rb532_defconfig | 1 - arch/mips/configs/rt305x_defconfig | 1 - arch/mips/configs/sb1250_swarm_defconfig | 1 - arch/mips/configs/tb0219_defconfig | 1 - arch/mips/configs/tb0226_defconfig | 1 - arch/mips/configs/tb0287_defconfig | 1 - arch/mips/configs/vocore2_defconfig | 1 - arch/mips/configs/xway_defconfig | 1 - arch/mips/include/asm/cpu.h | 125 +++++++-------- arch/mips/include/asm/io.h | 11 ++ arch/mips/include/asm/kprobes.h | 1 + arch/mips/include/asm/mach-ralink/pinmux.h | 5 +- arch/mips/jz4740/board-qi_lb60.c | 16 +- arch/mips/kernel/ftrace.c | 23 +-- arch/mips/kernel/kprobes.c | 2 +- arch/mips/kernel/perf_event_mipsxx.c | 30 ++-- arch/mips/lantiq/irq.c | 177 +++++++++++++++------ drivers/memory/Kconfig | 2 +- drivers/memory/jz4780-nemc.c | 28 +++- drivers/net/fddi/defza.c | 1 + 54 files changed, 439 insertions(+), 201 deletions(-)