target-arm queue:

* some updates to MAINTAINERS file entries
  * cadence_gem: Remove an incorrect assert()
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJb+/vOAAoJEDwlJe0UNgze5w8QAKdMMpkJYMyGDAmAcFnFpr7N
 nIZWTL6B8krJ9CBNlSbW8rsi3yqyNw+lmH//jSB8KJYYk/UGYkT5v7BdOZdm5W9J
 hsuW6LdVgWTPHiLvGEmBTFX4vSE6uuE4nrgEFG+EEf+SV7RZ7B9auYnCzOHTJDBv
 2Pc/pOJPttJ5nXnkIe7kzEYg3xBsKSIlGnHs6nCKllGh9kwgaTQ5MEqcP3C2OSY2
 W361UCkYogqslJ+rQXY5QBS9webGpUcumog9TnYF/wjf8VF9pFDE+OrbFTYzifsq
 lfGdgEL5NAws0M+9m/95u+SRdW7RtQaUNXqNK+jg6y7cKg6pRqw+lftbqgNnt10D
 FvQ4oyRLHhafMxJY04d8Q+OAxsWBE/8gXRfczsfqoOiDh9KFQG1x92U+vRGlHg6p
 /GXBf+CHgpLa/0lW2CEveTYWXmdifzQtD4EVnHsbmvphHQ4tn7L9EIGI1Ak96MR2
 L2r/mgtC6Uke3VWtKhhN3SUlj0mqlG+67tz7LUFWZa9BcIg/vWng9gRLC/VkZlyK
 jhYmia84gkwEP0vSNN1pC/4oYwXFc1NGIW87LNleTKgZJHdXZIa7m/92QOyZgfg7
 G10FLVCBJsi1VGgr9RYhE+XeLq02duWN7SNg1k9LWgbwfEW1hvZYUmi6SFStL4gR
 GgMUXYf1wvbNqLF7kCmY
 =fZXf
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20181126' into staging

target-arm queue:
 * some updates to MAINTAINERS file entries
 * cadence_gem: Remove an incorrect assert()

# gpg: Signature made Mon 26 Nov 2018 13:57:34 GMT
# gpg:                using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20181126:
  net: cadence_gem: Remove incorrect assert()
  MAINTAINERS: Add an ARM SMMU section
  MAINTAINERS: Assign some more files in the hw/arm/ directory

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

MAINTAINERS

@@ -151,6 +151,13 @@ F: disas/arm.c
 F: disas/arm-a64.cc
 F: disas/libvixl/
 
+ARM SMMU
+M: Eric Auger <eric.auger@redhat.com>
+L: qemu-arm@nongnu.org
+S: Maintained
+F: hw/arm/smmu*
+F: include/hw/arm/smmu*
+
 CRIS
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
@@ -535,6 +542,17 @@ L: qemu-arm@nongnu.org
 S: Odd Fixes
 F: hw/arm/gumstix.c
 
+i.MX25 PDK
+M: Peter Maydell <peter.maydell@linaro.org>
+R: Jean-Christophe Dubois <jcd@tribudubois.net>
+L: qemu-arm@nongnu.org
+S: Odd Fixes
+F: hw/arm/fsl-imx25.c
+F: hw/arm/imx25_pdk.c
+F: hw/misc/imx25_ccm.c
+F: include/hw/arm/fsl-imx25.h
+F: include/hw/misc/imx25_ccm.h
+
 i.MX31 (kzm)
 M: Peter Chubb <peter.chubb@nicta.com.au>
 M: Peter Maydell <peter.maydell@linaro.org>
@@ -617,6 +635,7 @@ R: Andrew Baumann <Andrew.Baumann@microsoft.com>
 R: Philippe Mathieu-Daudé <f4bug@amsat.org>
 L: qemu-arm@nongnu.org
 S: Odd Fixes
+F: hw/arm/raspi.c
 F: hw/arm/raspi_platform.h
 F: hw/*/bcm283*
 F: include/hw/arm/raspi*
@@ -641,8 +660,12 @@ F: hw/arm/spitz.c
 F: hw/arm/tosa.c
 F: hw/arm/z2.c
 F: hw/*/pxa2xx*
+F: hw/display/tc6393xb.c
+F: hw/gpio/max7310.c
+F: hw/gpio/zaurus.c
 F: hw/misc/mst_fpga.c
 F: include/hw/arm/pxa.h
+F: include/hw/arm/sharpsl.h
 
 SABRELITE / i.MX6
 M: Peter Maydell <peter.maydell@linaro.org>

hw/net/cadence_gem.c

@@ -979,7 +979,6 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
 
         /* Do nothing if receive is not enabled. */
         if (!gem_can_receive(nc)) {
-            assert(!first_desc);
             return -1;
         }