pull request for 3.7

pull request for 3.7

[John Crispin]

Hi Ralf,

first try with a pull request ... if anything foobar'ed tell me so i can fix it

Thanks,
John

The following changes since commit 9160338de92c0305329be5163a76f849806e83de:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (2012-08-20 16:42:41 -0700)

are available in the git repository at:


  git://dev.phrozen.org/mips-next.git master

for you to fetch changes up to 476e9629c61a7620dabffea99f1dcc570b22245c:

  MIPS: Fix build error for non-malta VSMP kernel (2012-08-21 19:15:16 +0200)

----------------------------------------------------------------
Anoop P A (1):
      MIPS: Fix build error for non-malta VSMP kernel

David Daney (2):
      MIPS: OCTEON: Add register definitions for SPI host hardware.
      spi: Add SPI master controller for OCTEON SOCs.

Florian Fainelli (3):
      MIPS: introduce CPU_GENERIC_DUMP_TLB
      MIPS: introduce CPU_R4K_FPU
      MIPS: introduce CPU_R4K_CACHE_TLB

Ganesan Ramalingam (1):
      MIPS: Netlogic: DTS file for XLP boards

Jayachandran C (4):
      MIPS: Netlogic: merge of.c into setup.c
      MIPS: Netlogic: Move serial ports to device tree
      MIPS: Netlogic: Add support for built in DTB
      MIPS: Netlogic: XLP defconfig update

John Crispin (1):
      MIPS: lantiq: explicitly enable clkout generation

 .../devicetree/bindings/spi/spi-octeon.txt         |   33 ++
 arch/mips/Kconfig                                  |   13 +
 arch/mips/configs/nlm_xlp_defconfig                |  133 +++++---
 arch/mips/include/asm/octeon/cvmx-mpi-defs.h       |  328 +++++++++++++++++
 arch/mips/kernel/Makefile                          |   19 +-
 arch/mips/kernel/smp-mt.c                          |    2 +
 arch/mips/lantiq/xway/sysctrl.c                    |    2 +
 arch/mips/lib/Makefile                             |   21 +-
 arch/mips/mm/Makefile                              |   17 +-
 arch/mips/netlogic/Kconfig                         |   15 +
 arch/mips/netlogic/Makefile                        |    1 +
 arch/mips/netlogic/dts/Makefile                    |    4 +
 arch/mips/netlogic/dts/xlp_evp.dts                 |  124 +++++++
 arch/mips/netlogic/xlp/Makefile                    |    3 +-
 arch/mips/netlogic/xlp/of.c                        |   34 --
 arch/mips/netlogic/xlp/platform.c                  |  108 ------
 arch/mips/netlogic/xlp/setup.c                     |   32 ++-
 drivers/spi/Kconfig                                |    7 +
 drivers/spi/Makefile                               |    1 +
 drivers/spi/spi-octeon.c                           |  369 ++++++++++++++++++++
 20 files changed, 1024 insertions(+), 242 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt
 create mode 100644 arch/mips/include/asm/octeon/cvmx-mpi-defs.h
 create mode 100644 arch/mips/netlogic/dts/Makefile
 create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts
 delete mode 100644 arch/mips/netlogic/xlp/of.c
 delete mode 100644 arch/mips/netlogic/xlp/platform.c
 create mode 100644 drivers/spi/spi-octeon.c

Re: pull request for 3.7

[Ralf Baechle]

On Tue, Aug 21, 2012 at 07:27:08PM +0200, John Crispin wrote:

> first try with a pull request ... if anything foobar'ed tell me so i can fix it

Thanks.  I pulled and resolved the one resulting conflict.

  Ralf

Re: pull request for 3.7

[Steven J. Hill]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

When can I expect stuff from MIPS to actually get in the tree?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlA0MW8ACgkQgyK5H2Ic36eaBgCfXXucT2IIwJAn3kVP5isS1lN6
dSkAmwbLUjKuY+Lkxqvpu0tSCJsU4oOV
=E5jT
-----END PGP SIGNATURE-----

Re: pull request for 3.7

[John Crispin]

On 22/08/12 03:10, Steven J. Hill wrote:
> When can I expect stuff from MIPS to actually get in the tree?


once you are online and reply to my chat requests ...

i wanted to queue your stuff, but you have been awol for 10 days now

John