18 May, 2016

1 commit

• 08a6ee580   Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel ... Browse Code »

  Merge tag 'qcom-soc-for-4.7-2' into net-next

  This merges the Qualcomm SOC tree with the net-next, solving the
  merge conflict in the SMD API between the two.

  David S. Miller

  2016-05-18 02:11:19 +0800  

17 May, 2016

1 commit

• a986a05de   net: qrtr: fix build problems ... Browse Code »

  Having multiple loadable modules with the same name cannot work
  with modprobe, and having both net/qrtr/smd.ko and drivers/soc/qcom/smd.ko
  results in a (somewhat cryptic) build error:

  ERROR: "qcom_smd_driver_unregister" [net/qrtr/smd.ko] undefined!
  ERROR: "qcom_smd_driver_register" [net/qrtr/smd.ko] undefined!
  ERROR: "qcom_smd_set_drvdata" [net/qrtr/smd.ko] undefined!
  ERROR: "qcom_smd_send" [net/qrtr/smd.ko] undefined!
  ERROR: "qcom_smd_get_drvdata" [net/qrtr/smd.ko] undefined!
  ERROR: "qcom_smd_driver_unregister" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
  ERROR: "qcom_smd_driver_register" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
  ERROR: "qcom_smd_set_drvdata" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
  ERROR: "qcom_smd_send" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!
  ERROR: "qcom_smd_get_drvdata" [drivers/soc/qcom/wcnss_ctrl.ko] undefined!

  Also, the qrtr driver uses the SMD interface and has a Kconfig dependency,
  but also allows for compile-testing when SMD is disabled. However, if
  with QCOM_SMD=m and COMPILE_TEST=y we can end up with QRTR_SMD=y and
  that fails with a related link error.

  The changes the dependency so we can still compile-test the driver but
  not have it built-in if SMD is a module, to avoid running in the broken
  configuration, and changes the Makefile to provide the driver under
  a different module name.

  Signed-off-by: Arnd Bergmann
  Fixes: bdabad3e363d ("net: Add Qualcomm IPC router")
  Signed-off-by: David S. Miller

  Arnd Bergmann

  2016-05-17 01:44:58 +0800  

14 May, 2016

1 commit

• f79a917e6   Merge tag 'qcom-soc-for-4.7-2' into net-next ... Browse Code »

  This merges the Qualcomm SOC tree with the net-next, solving the
  merge conflict in the SMD API between the two.

  Signed-off-by: Bjorn Andersson

  Bjorn Andersson

  2016-05-14 05:42:23 +0800  

09 May, 2016

1 commit

• bdabad3e3   net: Add Qualcomm IPC router ... Browse Code »

  Add an implementation of Qualcomm's IPC router protocol, used to
  communicate with service providing remote processors.

  Signed-off-by: Courtney Cavin
  Signed-off-by: Bjorn Andersson
  [bjorn: Cope with 0 being a valid node id and implement RTM_NEWADDR]
  Signed-off-by: Bjorn Andersson
  Signed-off-by: David S. Miller

  Courtney Cavin

  2016-05-09 11:46:14 +0800