diff options
| author | mendigodepijama <mendigodepijama@gmail.com> | 2019-05-17 16:50:44 -0300 |
|---|---|---|
| committer | Lucas Ponez <lucasponez@outlook.com> | 2019-07-14 14:51:09 +0000 |
| commit | eb14693b04ae217577950da75a7bbee33f11fe6c (patch) | |
| tree | 681c53ab1afc7ca295d624bb1fdeb2ff5e1c0602 | |
| parent | c07c6ebb006fdd4b1e4d198ebda27320d46fbbf3 (diff) | |
| parent | 6b1ae527b1fdee86e81da0cb26ced75731c6c0fa (diff) | |
Merge tag 'v3.18.140' into 9.0-eas-caf-simplep9.0
This is the 3.18.140 stable release
Change-Id: I6c559ca2027bb03707c7fae479279c0b102eb028
| -rw-r--r-- | arch/arm64/configs/sanders_defconfig | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8851.c | 2 | ||||
| -rw-r--r-- | init/main.c | 1 | ||||
| -rw-r--r-- | net/packet/af_packet.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/configs/sanders_defconfig b/arch/arm64/configs/sanders_defconfig index f87878718bbb..51f769d0beac 100644 --- a/arch/arm64/configs/sanders_defconfig +++ b/arch/arm64/configs/sanders_defconfig @@ -43,7 +43,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Extreme-MaxPlus-Kernel-SIMPLE" +CONFIG_LOCALVERSION="-Extreme-MaxPlus-Cold" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 4dc8e345089b..d677c33f8625 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -713,10 +713,8 @@ static void ks8851_rx_pkts3(struct ks8851_net *ks) rxpkt = (u8 *)&buf32[index32]; } - /* end DMA access and dequeue packet */ ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF); - } ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); kfree(buf); diff --git a/init/main.c b/init/main.c index b78dc44d0793..1c3cd828c2fe 100644 --- a/init/main.c +++ b/init/main.c @@ -552,6 +552,7 @@ asmlinkage __visible void __init start_kernel(void) parse_args("Setting init args", after_dashes, NULL, 0, -1, -1, NULL, set_init_arg); + /* * These use large bootmem allocations and must precede * kmem_cache_init() diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b94a2a217a79..3db9ee768f76 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4234,7 +4234,7 @@ static int __init packet_init(void) rc = register_netdevice_notifier(&packet_netdev_notifier); if (rc) goto out_pernet; - + return 0; out_pernet: |