Changes in Platform

4b4193256c8d3bc3a5397b5cd9494c2ad386317d - Merge branch 'next' into for-linus

Tue, 15 Dec 2020 00:27:23 +0000

Merge branch 'next' into for-linusPrepare input updates for 5.11 merge window. List of files: /linux/arch/mips/sgi-ip32/Platform

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 02:13:23 +0000

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/arch/mips/sgi-ip32/Platform

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 12:19:48 +0000

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/arch/mips/sgi-ip32/Platform

3b5d1afd1f13bcab85eaa28223ad396694f929e3 - Merge branch 'for-next' into for-linus

Mon, 03 Aug 2020 06:10:08 +0000

Merge branch 'for-next' into for-linus List of files: /linux/arch/mips/sgi-ip32/Platform

98817a84ff1c755c347ac633ff017a623a631fad - Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Tue, 30 Jun 2020 10:07:51 +0000

Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgentPull irqchip fixes from Marc Zyngier: - Fix atomicity of affinity update in the GIC driver - Don't sleep in atomic when waiting for a GICv4.1 RD to respond - Fix a couple of typos in user-visible messages List of files: /linux/arch/mips/sgi-ip32/Platform

77346a704c913268a2dad68d59523fd85dc74088 - Merge tag 'v5.8-rc3' into arm/qcom

Tue, 30 Jun 2020 09:32:02 +0000

Merge tag 'v5.8-rc3' into arm/qcomLinux 5.8-rc3 List of files: /linux/arch/mips/sgi-ip32/Platform

60e9eabf41fa916d2ef68c5bf929197975917578 - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Mon, 29 Jun 2020 10:15:51 +0000

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextSome conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.Signed-off-by: Maarten Lankhorst List of files: /linux/arch/mips/sgi-ip32/Platform

0f69403d2535ffc7200a8414cf3ca66a49b0d741 - Merge drm/drm-next into drm-intel-next-queued

Thu, 25 Jun 2020 15:05:03 +0000

Merge drm/drm-next into drm-intel-next-queuedCatch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap lockingAPI: convert mmap_sem comments").Signed-off-by: Jani Nikula List of files: /linux/arch/mips/sgi-ip32/Platform

6870112c46c867f50cd27570860a05bd82614b5c - Merge tag 'v5.8-rc1' into regulator-5.8

Wed, 17 Jun 2020 11:39:12 +0000

Merge tag 'v5.8-rc1' into regulator-5.8Linux 5.8-rc1 List of files: /linux/arch/mips/sgi-ip32/Platform

07c7b547a79605f1041d55b84d91a4a4d9c5b363 - Merge tag 'v5.8-rc1' into fixes

Tue, 16 Jun 2020 16:25:03 +0000

Merge tag 'v5.8-rc1' into fixesLinux 5.8-rc1 List of files: /linux/arch/mips/sgi-ip32/Platform

4b3c1f1b15f576445c221cbc77a88540433a2ba7 - Merge v5.8-rc1 into drm-misc-fixes

Tue, 16 Jun 2020 11:31:47 +0000

Merge v5.8-rc1 into drm-misc-fixesBeginning a new release cycles for what will become v5.8. Updatingdrm-misc-fixes accordingly.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/mips/sgi-ip32/Platform

8440d4a75d90556cfb8fb3e244443f67381aafd6 - Merge branch 'dt/schema-cleanups' into dt/linus

Fri, 12 Jun 2020 15:57:00 +0000

Merge branch 'dt/schema-cleanups' into dt/linus List of files: /linux/arch/mips/sgi-ip32/Platform

f77d26a9fc525286bcef3d4f98b52e17482cf49c - Merge branch 'x86/entry' into ras/core

Thu, 11 Jun 2020 13:17:57 +0000

Merge branch 'x86/entry' into ras/coreto fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific followup patches can be applied without creating a horrible merge conflictafterwards. List of files: /linux/arch/mips/sgi-ip32/Platform

8226f11318bd03ae0dbf028f7c433071cf4927f4 - Merge tag 'mips_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Wed, 03 Jun 2020 20:32:21 +0000

Merge tag 'mips_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linuxPull MIPS updates from Thomas Bogendoerfer: - added support for MIPSr5 and P5600 cores - converted Loongson PCI driver into a PCI host driver using the generic PCI framework - added emulation of CPUCFG command for Loogonson64 cpus - removed of LASAT, PMC MSP71xx and NEC MARKEINS/EMMA - ioremap cleanup - fix for a race between two threads faulting the same page - various cleanups and fixes* tag 'mips_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (143 commits) MIPS: ralink: drop ralink_clk_init for mt7621 MIPS: ralink: bootrom: mark a function as __init to save some memory MIPS: Loongson64: Reorder CPUCFG model match arms MIPS: Expose Loongson CPUCFG availability via HWCAP MIPS: Loongson64: Guard against future cores without CPUCFG MIPS: Fix build warning about "PTR_STR" redefinition MIPS: Loongson64: Remove not used pci.c MIPS: Loongson64: Define PCI_IOBASE MIPS: CPU_LOONGSON2EF need software to maintain cache consistency MIPS: DTS: Fix build errors used with various configs MIPS: Loongson64: select NO_EXCEPT_FILL MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() MIPS: mm: add page valid judgement in function pte_modify mm/memory.c: Add memory read privilege on page fault handling mm/memory.c: Update local TLB if PTE entry exists MIPS: Do not flush tlb page when updating PTE entry MIPS: ingenic: Default to a generic board MIPS: ingenic: Add support for GCW Zero prototype MIPS: ingenic: DTS: Add memory info of GCW Zero MIPS: Loongson64: Switch to generic PCI driver ... List of files: /linux/arch/mips/sgi-ip32/Platform

26bff9eb49201aeb4e1b32d698c191831a39f5d4 - MIPS: Only include the platform file needed

Wed, 06 May 2020 16:24:02 +0000

MIPS: Only include the platform file neededInstead of including all Platform files, we simply include theneeded one and avoid clashes with makefile variables.Signed-off-by: Thomas Bogendoerfer List of files: /linux/arch/mips/sgi-ip32/Platform

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/arch/mips/sgi-ip32/Platform

2d8ad8719591fa803b0d589ed057fa46f49b7155 - Merge commit 'v2.6.38-rc1' into kbuild/packaging

Wed, 09 Mar 2011 15:15:44 +0000

Merge commit 'v2.6.38-rc1' into kbuild/packaging List of files: /linux/arch/mips/sgi-ip32/Platform

e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd - Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest

Wed, 26 Jan 2011 09:24:18 +0000

Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest List of files: /linux/arch/mips/sgi-ip32/Platform

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 06:06:28 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/arch/mips/sgi-ip32/Platform

8990c1bc4be46473ad19bf2fa612ca57286f3df4 - Merge commit 'v2.6.37-rc1' into kbuild/kbuild

Tue, 14 Dec 2010 21:01:55 +0000

Merge commit 'v2.6.37-rc1' into kbuild/kbuild List of files: /linux/arch/mips/sgi-ip32/Platform