summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
jogo [Wed, 1 Jul 2015 00:32:10 +0000 (00:32 +0000)]
CC: kernel: update 3.18 to 3.18.17
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17
Backport of r46150.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46155
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Wed, 1 Jul 2015 00:32:03 +0000 (00:32 +0000)]
CC: brcm63xx: swap a4001n power leds again
This partially reverts r44577 ("brcm63xx: fix DTS LEDs and buttons").
Fixes #19858.
Backport of r46149.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46154
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Wed, 1 Jul 2015 00:32:01 +0000 (00:32 +0000)]
CC: brcm63xx: unbreak board_probe_switch again
Also move it to an earlier place so new boards added are less likely
to confuse quilt.
Fixes #19965.
Backport of r46148.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46153
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 29 Jun 2015 08:24:13 +0000 (08:24 +0000)]
Revert "ar71xx: add profile and build image for EnGenius EPG5000."
This reverts commit
ac3184da4138c54b8a2c1be637be7cf78fc40fce.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46144
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 29 Jun 2015 08:24:07 +0000 (08:24 +0000)]
Revert "ar71xx: add user-space support for EnGenius EPG5000."
This reverts commit
e3326c4473bc6b7b5fd899ac955af974ebc64b92.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46143
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Mon, 29 Jun 2015 08:24:03 +0000 (08:24 +0000)]
Revert "ar71xx: add kernel support for EnGenius EPG5000."
This reverts commit
27386b74adfe868f693176f55861984432afd2ce.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46142
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Mon, 22 Jun 2015 07:59:09 +0000 (07:59 +0000)]
b53: Allow using all 8 ports on BCM53011
On two tested devices: Netgear R6250 (BCM53011 rev 2) and Luxul XWC-1000
(BCM53011 rev 3) it was possible to use port 7 and eth1 (instead of port
5 and eth0). It seems BCM53011 just like BCM53012 has 8 ports and
usually 3 of them are connected to the SoC.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46104
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46107
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:08:32 +0000 (20:08 +0000)]
bcm53xx: respect ACTIVE_LOW when powering USB using GPIO
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46088
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46103
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:08:27 +0000 (20:08 +0000)]
bcm53xx: enable USB power on Buffalo WZR-1750DHP
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46087
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46102
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:08:21 +0000 (20:08 +0000)]
bcm53xx: update SPROM driver to include just-sent patch
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46086
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46101
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:08:11 +0000 (20:08 +0000)]
mac80211: backport some brcmfmac patches
There are two important patches in this patchset: updating read pointer
quicker & rework of .get_station().
There are few more upstream patches that are p2p-related and weren't
backported in this commit.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46084
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46100
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:08:03 +0000 (20:08 +0000)]
bcm53xx: enable USB power on Netgear R6250
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46083
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46099
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:07:58 +0000 (20:07 +0000)]
bcm53xx: update xHCI patch
This drops some debugging pr_info and adds platform_device_unregister.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46082
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46098
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:07:52 +0000 (20:07 +0000)]
bcm53xx: fix enabling GPIO-controlled USB power
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46081
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46097
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:07:44 +0000 (20:07 +0000)]
bcm53xx: add xHCI support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46080
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46096
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:06:31 +0000 (20:06 +0000)]
ramips: refresh patch with USB_MT7621_XHCI_PLATFORM
Fixes:
edea6dfde4dc ("kernel: make USB_XHCI_PLATFORM selectable")
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46085
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46095
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:06:24 +0000 (20:06 +0000)]
kernel: make USB_XHCI_PLATFORM selectable
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46079
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46094
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:04:48 +0000 (20:04 +0000)]
otrx: optimize memory usage by function checking TRX CRC
Allocating huge buffer for the whole TRX wasn't too optimal.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46078
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46093
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Sun, 21 Jun 2015 20:04:42 +0000 (20:04 +0000)]
otrx: make crc32 table global for further optimizations
So far we got only one generic function accessing this table, but
implementing optimizations will require calculating crc32 in other code
parts as well.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r46077
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46092
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 21 Jun 2015 17:52:47 +0000 (17:52 +0000)]
ath9k: fix ar956x device detection
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46090
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46091
3c298f89-4303-0410-b956-
a3cf2f4a3e73
kaloz [Fri, 19 Jun 2015 08:35:57 +0000 (08:35 +0000)]
mwlwifi: upgrade to 10.3.0.3 (backport of r46061)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46062
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:49 +0000 (20:24 +0000)]
ralink: add support for mt7621 switch counters
Signed-off-by: Cristian Morales Vega <cristian@samknows.com>
Backport of r46050
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46060
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:45 +0000 (20:24 +0000)]
ar71xx: add profile and build image for EnGenius EPG5000.
Signed-off-by: Christian Beier <cb@shoutrlabs.com>
Backport of r46049
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46059
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:41 +0000 (20:24 +0000)]
ar71xx: add user-space support for EnGenius EPG5000.
Signed-off-by: Christian Beier <cb@shoutrlabs.com>
Backport of r46048
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46058
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:31 +0000 (20:24 +0000)]
ar71xx: add kernel support for EnGenius EPG5000.
Signed-off-by: Christian Beier <cb@shoutrlabs.com>
Backport of r46047
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46057
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:26 +0000 (20:24 +0000)]
ar71xx: add support for TL-WR720N-v4.
The hardware should be almost the same as TL-WR720N-v3. WiFi and LAN networks
were tested by "Lo Yuk Fai <loyukfai@gmail.com>". Failsafe and slider switch
were tested by "Wong min <alpha080@gmail.com>".
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Backport of r46046
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46056
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:20 +0000 (20:24 +0000)]
ar71xx: add support for compex wpj531
tftpboot 0x80500000 openwrt-ar71xx-generic-wpj531-16M-squashfs-sysupgrade.bin
erase 0x9f030000 +$filesize
erase 0x9f680000 +1
cp.b $fileaddr 0x9f030000 $filesize
Signed-off-by: Christian Mehlis <christian@m3hlis.de>
Backport of r46045
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46055
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:15 +0000 (20:24 +0000)]
ar71xx: Add Support for the Bitmain Antminer S1
This patch adds support for the Bitmain Antminer S1 Cryptocurrency Miner
http://wiki.openwrt.org/toh/bitmain/s1
Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
Acked-by: James Hilliard <james.hilliard1@gmail.com>
Backport of r46044
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46054
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:12 +0000 (20:24 +0000)]
ramips: Add Support for the Linksys RE6500
This patch adds support for the Linksys RE6500 Range Extender
http://wiki.openwrt.org/toh/linksys/re6500
Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
Backport of r46043
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46053
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:09 +0000 (20:24 +0000)]
ramips: Add support for the D-Link DCS-930 B1
http://wiki.openwrt.org/toh/d-link/dcs-930l
Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
Backport of r46042
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46052
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 20:24:05 +0000 (20:24 +0000)]
ramips: add support for PandoraBox PBR-M1
This patch is for PandoraBox PBR-M1 which is based on mt7621,
all the features work fine, including rtc, leds, button, usb3.0, etc.
Signed-off-by: tymon <banglang.huang@foxmail.com>
Backport of r46041
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46051
3c298f89-4303-0410-b956-
a3cf2f4a3e73
blogic [Thu, 18 Jun 2015 12:06:15 +0000 (12:06 +0000)]
ramips: fix a bug in the cevt code on mt7620
Signed-off-by: John Crispin <blogic@openwrt.org>
Backport of r46038
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46039
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Thu, 18 Jun 2015 09:42:00 +0000 (09:42 +0000)]
ar71xx: fix hw id of tl-wr710n image (#19902)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46032
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46033
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Thu, 18 Jun 2015 06:42:11 +0000 (06:42 +0000)]
procd: update to the latest version, fixes umask handling for creating /dev/shm
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46023
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46028
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jow [Wed, 17 Jun 2015 11:36:51 +0000 (11:36 +0000)]
CC: x86/64: enable VirtIO block and console support
This is required to use x86/64 in KVM containers with VirtIO disks
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r46017
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46018
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Wed, 17 Jun 2015 10:22:06 +0000 (10:22 +0000)]
ar71xx: rb493g: fix gpio-mdio accesses under load
It seems that there are maximum timings for mdio accesses that can be
hit when the system is under load and the thread is scheduled during
a read or write access. Since there is no way of knowing if this
happens as there is not even a parity bit, try to work around it
by disabling interrupts during any gpio-mdio accesses.
Performance impact seems to be neglectable, as mdio accesses are not
that often.
Hopefully fixes #19500.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Backport of r46012.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46016
3c298f89-4303-0410-b956-
a3cf2f4a3e73
jogo [Wed, 17 Jun 2015 10:22:04 +0000 (10:22 +0000)]
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Wed, 17 Jun 2015 10:13:42 +0000 (10:13 +0000)]
procd: update to the latest version, fixes /dev/shm permissions
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46013
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46014
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Wed, 17 Jun 2015 09:11:08 +0000 (09:11 +0000)]
ath9k: add another fix for some rx/tx dma stop issues, refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46008
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46010
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Wed, 17 Jun 2015 09:10:08 +0000 (09:10 +0000)]
kernel: add missing config symbol
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r46007
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46009
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Tue, 16 Jun 2015 13:38:37 +0000 (13:38 +0000)]
base-files: replace snapshot key with 15.05 release key
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46002
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Tue, 16 Jun 2015 10:51:38 +0000 (10:51 +0000)]
opkg: fix duplicate check_signature line for smime variant (#19863)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r45999
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46000
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Tue, 16 Jun 2015 08:32:17 +0000 (08:32 +0000)]
bcm53xx: use USB patches sent upstream by Hauke
This stabilizes USB support. The old patch was handling initialization
in a different order that was causing some problems with few USB 3.0
devices. Some weren't detected, some were working unstable, sometimes
USB 3.0 could hang the whole controller.
A still known issue (but not a regression) is controller hang triggered
by connecting USB 1.1 device when not having OHCI controller enabled
(kmod-usb-ohci).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r45997
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45998
3c298f89-4303-0410-b956-
a3cf2f4a3e73
rmilecki [Tue, 16 Jun 2015 05:04:53 +0000 (05:04 +0000)]
kernel: use bcma-hcd.ko on bcm53xx for ohci
On bcm53xx we still need usb-ohci to support USB 1.1 devices and it
obviously needs bcma-hcd.ko that will init controller and register
platform device.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r45994
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45996
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Mon, 15 Jun 2015 21:16:55 +0000 (21:16 +0000)]
kernel: add missing config symbol (#19870)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r45992
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45993
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Mon, 15 Jun 2015 21:15:36 +0000 (21:15 +0000)]
mt76: update to the latest version to fix a build error (#19871)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r45990
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45991
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Mon, 15 Jun 2015 13:42:43 +0000 (13:42 +0000)]
version.mk: adjust for CC release
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45989
3c298f89-4303-0410-b956-
a3cf2f4a3e73
cyrus [Mon, 15 Jun 2015 08:00:46 +0000 (08:00 +0000)]
Update dnsmasq to v2.73.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45987
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Mon, 15 Jun 2015 07:46:55 +0000 (07:46 +0000)]
Revert "kernel: add rtl8723au driver (staging)"
This one cannot possibly work, as it depends on cfg80211, which is built
out of tree.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r45985
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45986
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 14 Jun 2015 18:35:59 +0000 (18:35 +0000)]
feeds.conf.default: use the for-15.05 branches, drop targets feed
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45978
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 14 Jun 2015 18:17:54 +0000 (18:17 +0000)]
remove broken targets
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45977
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 14 Jun 2015 18:17:49 +0000 (18:17 +0000)]
gcc: remove version 4.9
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45976
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 14 Jun 2015 18:17:47 +0000 (18:17 +0000)]
kernel: remove linux 4.0
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45975
3c298f89-4303-0410-b956-
a3cf2f4a3e73
nbd [Sun, 14 Jun 2015 17:57:16 +0000 (17:57 +0000)]
add chaos_calmer branch
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@45974
3c298f89-4303-0410-b956-
a3cf2f4a3e73