aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-19Make neo1973kbd.c build without CONFIG_PMWerner Almesberger
global_inside_suspend only exists if CONFIG_PM is enabled. We're actually the only ones using it outside power management, so I guess it's okay not to try to find a more elegant solution for upstream. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-19Make s3c24xx-pw build without CONFIG_PMWerner Almesberger
Fix suspend/resume dummy in mach-s3c2410/pwm.c Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-19Make jbt6k74.c build without CONFIG_PMWerner Almesberger
Fix resume dummy in jbt6k74.c Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-19Make glamo-fb.c build without CONFIG_PMWerner Almesberger
Fix suspend/resume dummy in glamo-fb.c Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-19MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-fix-touchscreen-fi ↵merge
lter-include-1232325217 pending-tracking-hist top was MERGE-via-stable-tracking-fix-touchscreen-filter-include-1232325217 / d063e8c6d85c48de80b3d158bfa98d5a97149711 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-fix-touchscreen-filter-include stable-tracking-hist top was fix-touchscreen-filter-include / bb151f28fc8e8923baad96e0f3e8f0ae57af95f5 ... parent commitmessage: From: Nelson Castillo <arhuaco@freaks-unidos.net> Fix touchscreen filter includes Fix #includes to make the kernel compile again. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-01-19build-increase-parallel.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-16MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-rfkill-support-for ↵merge
-the-ar6000-1232104308 pending-tracking-hist top was MERGE-via-stable-tracking-rfkill-support-for-the-ar6000-1232104308 / 09faeb511e9e6872c79b4d1ea2f3b5fefc16f3a1 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-rfkill-support-for-the-ar6000- stable-tracking-hist top was rfkill-support-for-the-ar6000- / e82f8ffa04ebcb05506c8e22268371c3c3b03173 ... parent commitmessage: From: Werner Almesberger <werner@openmoko.org> rfkill support for the AR6000 driver This patch adds rfkill support to the AR6000 driver. The driver does not directly implement an rfkill device but uses the help of a special platform device, such that the latter can retain rfkill state when the AR6k driver is removed (e.g., because of suspend). If an attempt is made to bring the driver up (module load, bind, or resume) while rfkill is blocking, only the driver's data structures are initialized, but function activation and most of the rest of the setup is deferred until the rfkill block is removed. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-15MERGE-via-pending-tracking-hist-clean-pcf50633-delete-deprecatmerge
pending-tracking-hist top was clean-pcf50633-delete-deprecat / 4eb8d070641202940f12587b7efb77cac781b19d ... parent commitmessage: From: Andy Green <andy@openmoko.com> clean-pcf50633-delete-deprecated-sensors-version.patch Proposed-by: Sven sleipnir Rebhan <odinshorse@googlemail.com> Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-15avoid using irq_desc in glamo-mci.cWerner Almesberger
When building the MMC subsystem as modules, drivers/mfd/glamo/glamo-mci.ko cannot access irq_desc, because it isn't exported by kernel/irq/handle.c All the functions that indirectly access irq_desc are inlined, so they cannot be used to avoid having to resolve irq_desc. Fortunately, we can solve the problem locally: we don't really need to access irq_desc anyway. This patch splits glamo_mci_irq into a small wrapper that implements the IRQ handler interface and the main code that doesn't need to know about the semantics of the latter. Then we simply call the main code with the information we already have. Signed-off-by: Werner Almesberger <werner@openmoko.org> Tested-by: Rafael Ignacio Zurita <rizurita@yahoo.com>
2009-01-14WLAN: --power maxperf shot into the darkWerner Almesberger
As I've mentioned before, telling the WLAN module not to sleep with "wmiconfig -i eth0 --power maxperf" reportedly improves network stability in some situations where otherwise disconnects were frequent. (Sorry if this sounds rather vague. I don't have much real data on this phenomenon. More details would be welcome.) Paul Lever from Atheros suggested that one possible source of trouble when not using --power maxperf could be that the module very often takes a nap and then needs to delay new commands while waking up, and some SDIO hosts may fail to handle the delay properly. The S3C2442 manual leaves it unclear whether the controller handles this condition or not. The Linux MMC/SDIO stack explicitly polls for busy status in MMC mode but not in SDIO mode. I've attached a patch against andy-tracking that rather crudely checks if the module is signalling that it's still busy while we're about to start a new transfer, and delays in this case. In my tests, I could not make the busy condition occur (unless I explicitly violated the stack's synchronization), but then I hardly see any disconnects anyway. So it would be good if those affected by frequent loss of association could try this patch. More precisely, - if association with the base station is often lost, and - "wmiconfig -i eth0 --power maxperf" improves this, then - please apply this patch, leave WLAN power at default settings (i.e., wmiconfig -i eth0 --power rec), and report - if the patch had any effect on the stability of associations, and - whether "READ WHILE BUSY !" or "WRITE WHILE BUSY !" gets logged in dmesg. It may make sense to temporarily put this patch into andy-tracking. While it may be perfectly useless, it shouldn't create any new trouble either. In case it turns out to make a difference, I'll have to find a better place in the stack for it, so it'll be reverted either way. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-14GTA02 suspend keyboard patchMichael Trimarchi
Signed-off-by: Michael Trimarchi <trimarchimichael@yahoo.it>
2009-01-13MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-add-id_table-in-th ↵merge
e-i2c-driver-1231835937 pending-tracking-hist top was MERGE-via-stable-tracking-add-id_table-in-the-i2c-driver-1231835937 / cf8dd84d83700bf038b2de4376ce238f09499a15 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-add-id_table-in-the-i2c-driver stable-tracking-hist top was add-id_table-in-the-i2c-driver / 6c0bc11ccbb35c7477cc1208ab454ba5b6bf08b1 ... parent commitmessage: From: Matt Hsu <matt_hsu@openmoko.org> Add id_table in the i2c driver struct of lp5521. In new style i2c client, i2c driver should have id_table to match its device id. Otherwise, the attachment of i2c driver would be failed. Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-13MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-return-path-openmo ↵merge
ko-kernel-bo-1231786968 pending-tracking-hist top was MERGE-via-stable-tracking-return-path-openmoko-kernel-bo-1231786968 / 74cc4a9339e8cc15f05d94f76f851313f7667bcd ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-return-path-openmoko-kernel-bo stable-tracking-hist top was return-path-openmoko-kernel-bo / 05074908ceb3fd6cf9fdc218571c3bb1adc26cca ... parent commitmessage: From: Andy Green <agreen@pads.home.warmcat.com> Return-Path: <openmoko-kernel-bounces@lists.openmoko.org> Received: from mail.openmoko.org ([unix socket]) by mail.openmoko.org (Cyrus v2.1.18-IPv6-Debian-2.1.18-5.1) with LMTP; Mon, 12 Jan 2009 17:42:13 +0000 X-Sieve: CMU Sieve 2.2 Return-path: <openmoko-kernel-bounces@lists.openmoko.org> Received: from sita.openmoko.org ([88.198.124.203]) by mail.openmoko.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from <openmoko-kernel-bounces@lists.openmoko.org>) id 1LMQnk-00023C-W3 for andy@imap.openmoko.org; Mon, 12 Jan 2009 17:42:13 +0000 Received: from localhost ([127.0.0.1] helo=sita.openmoko.org) by sita.openmoko.org with esmtp (Exim 4.63) (envelope-from <openmoko-kernel-bounces@lists.openmoko.org>) id 1LMQnH-00021T-Ub; Mon, 12 Jan 2009 18:41:43 +0100 Received: from aakash.openmoko.org ([124.219.5.209]) by sita.openmoko.org with esmtp (Exim 4.63) (envelope-from <matt_hsu@openmoko.org>) id 1LMQnC-00021F-QB; Mon, 12 Jan 2009 18:41:42 +0100 Received: from [172.16.23.143] (helo=abacus-om.tw.openmoko.com ident=Debian-exim) by aakash.openmoko.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from <matt_hsu@openmoko.org>) id 1LMQhU-000398-Ik; Tue, 13 Jan 2009 01:35:54 +0800 Received: from matt by abacus-om.tw.openmoko.com with local (Exim 4.69) (envelope-from <matt_hsu@openmoko.org>) id 1LMRF1-0006Dl-2R; Tue, 13 Jan 2009 02:10:23 +0800 From: Matt Hsu <matt_hsu@openmoko.org> To: openmoko-kernel@lists.openmoko.org Date: Tue, 13 Jan 2009 02:10:23 +0800 Message-Id: <1231783823-23893-1-git-send-email-matt_hsu@openmoko.org> X-Mailer: git-send-email 1.5.6.5 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on sita.openmoko.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3 Subject: [PATCH] This patch fixs compiling warnings of pcap7200_ts driver. Cc: matt_hsu@openmoko.com X-BeenThere: openmoko-kernel@lists.openmoko.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Discussion regarding the OpenMoko Linux Kernel and boot loader <openmoko-kernel.lists.openmoko.org> List-Unsubscribe: <http://lists.openmoko.org/mailman/listinfo/openmoko-kernel>, <mailto:openmoko-kernel-request@lists.openmoko.org?subject=unsubscribe> List-Archive: <http://lists.openmoko.org/pipermail/openmoko-kernel> List-Post: <mailto:openmoko-kernel@lists.openmoko.org> List-Help: <mailto:openmoko-kernel-request@lists.openmoko.org?subject=help> List-Subscribe: <http://lists.openmoko.org/mailman/listinfo/openmoko-kernel>, <mailto:openmoko-kernel-request@lists.openmoko.org?subject=subscribe> Sender: openmoko-kernel-bounces@lists.openmoko.org Errors-To: openmoko-kernel-bounces@lists.openmoko.org In addition, it adds handling in case of any failures after creating sysfs. Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-12GTA02: get rid of CONFIG_MD and CONFIG_MMC_SDHCIWerner Almesberger
This patch removes CONFIG_MD from gta02-moredrivers-defconfig, which was dropped from the previous combined cleanup. It also removes CONFIG_MMC_SDHCI from both GTA02 defconfigs, since this kind of hardware doesn't exist in the S3C2442. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-12MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-add-missing-pcap72 ↵merge
00-guts-patc-1231750955 pending-tracking-hist top was MERGE-via-stable-tracking-add-missing-pcap7200-guts-patc-1231750955 / e65b1767efec44dadf4ee7163bedffc0aedfd06e ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-add-missing-pcap7200-guts-patc stable-tracking-hist top was add-missing-pcap7200-guts-patc / c010223ac23687b8a5c129dd389328b844445cde ... parent commitmessage: From: Matt Hsu <matt_hsu@openmoko.org> add-missing-pcap7200-guts.patch Patch by hand vs stg add issue... Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-12Change AR6k driver to module and remove CONFIG_MDWerner Almesberger
This patch changes the two GTA02 default configurations[1] to build the AR6k driver and S3C MCI (which is used exclusively by AR6k) as modules. This way, WLAN can be brought up only if we actually need it. The patch also disables CONFIG_MD, which served no clear purpose. [1] andy removed the moredrivers part despite asking for it because it can be useful to have it built in without syncing the rootfs, so the packaging config alone has it as modules. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-12AR6k: don't make a fuss if SIOCGIWSCAN returns no nodesWerner Almesberger
SIOCGIWSCAN can return an empty node list if there are indeed no nodes but also if we wait too long (more than about 20 seconds) between initiating the scan and retrieving the list of nodes. There's nothing suspicious per se about either condition, yet the AR6k driver returns an error code and printk's a complaint. This is a bit excessive and can mislead user space into believing a real error has occurred. This patch make this sort of failure silent, like in other WLAN drivers, e.g., ieee80211_wx.c:ieee80211_wx_get_scan Signed-off-by: Werner Almesberger <werner@openmoko.org>
2009-01-10enable lp5521 in gta03_defconfig.Matt Hsu
Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-10MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-add-coniditional-c ↵merge
heck-for-cal-1231608959 pending-tracking-hist top was MERGE-via-stable-tracking-add-coniditional-check-for-cal-1231608959 / cae5d78813ff79a460474e528049e39b0320bd94 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-add-coniditional-check-for-cal stable-tracking-hist top was add-coniditional-check-for-cal / 418cf8217d80f14f3ef56b9d1163bbc05bdbd3b4 ... parent commitmessage: From: Matt Hsu <matt_hsu@openmoko.org> Add coniditional check for callback function of lp5521 platform_data Avoid to break the support of N80, it's needed to have this check. Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-09Update mach-gta01.c to reflect the new plat-s3c changes.Balaji Rao
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2009-01-08MERGE-via-pending-tracking-hist-s3c64xx-fix-eint-group-macro-dmerge
pending-tracking-hist top was s3c64xx-fix-eint-group-macro-d / 2b782b2c91f8a43347d551f5a6cf0bb09243c27b ... parent commitmessage: From: Matt Hsu <matt_hsu@openmoko.org> S3C64XX: Fix EINT group macro definition EINT group macro produces an error. Fix this by giving correct macro arguments. Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-08clean-lp5521-warnings.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-08config-GTA03-whoops-not-gta02-lp5521.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-08config-GTA03-enable-lp5521.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-08Add registeration of lp5521 device on gta03.Matt Hsu
Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-08MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-this-patch-adds-pl ↵merge
atform_data-1231440460 pending-tracking-hist top was MERGE-via-stable-tracking-this-patch-adds-platform_data-1231440460 / fd9d8bd6cece9c29a1b018bdcbf92505253f7db2 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-this-patch-adds-platform_data- stable-tracking-hist top was this-patch-adds-platform_data- / a0a705b1c61ac32b6eacb2d96d2483510428a50d ... parent commitmessage: From: Matt Hsu <matt_hsu@openmoko.org> This patch adds platform_data and callback of suspend/resume Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-08build-remove-subdir-modules.patchAndy Green
We are not cleaning the module tarballs from the build subdirs Reported-by: Timo Juhani Lindfors <timo.lindfors@iki.fi> Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-07build-fix-module-gen.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-06Make group filter return samplesNelson Castillo
For consistency the group filter should return samples if it is the last filter in the chain. It is useful when you want to check what the filter does. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-01-06Remove unneeded concurrency check (s3c2410_ts.c)Nelson Castillo
This code was needed before but now it is not useful. event_send_timer_f is not called directly now thus the concurrency check is not needed. Remove it. We only schedule the timer using mod_timer. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-01-05fix-pcf50606-declaration-error.patchMatt Hsu
Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2009-01-05pcf50633 remove suspend_enable/disable regulator functionsBalaji Rao
Since we don't switch to PMU.standby, on suspend we should not be defining these. Btw, this fixes the WSOD I observed on andy-tracking and also gets rid of the regulator related backtrace seen upon resume. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2009-01-04fix-glamo-mci-ambiguous-timeout.patchAndy Green
Sometimes we see failures with cards where the status is eg, 0x310. This corresponds to a "no data" timeout and an assertion that the data is present. This patch makes the data present status have priority over the timeout status. Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-04implement_pm_power_off.patchBalaji Rao
This fixes the system-does-not-powerdown bug. Reported-by: Michael Trimarchi <trimarchimichael@yahoo.it> Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2009-01-04build-discrete-object-dirs.patchAndy Green
It's a hell of a lot faster swapping between build contexts if we use the O= option on the kernel makefile to maintain subdirs for each build context separately. Note this means you will have to make mrproper the toplevel kernel build directory, and use eg, ./build GTA02 from now on. Signed-off-by: Andy Green <andy@openmoko.com>
2009-01-02config-gta03-ts-filters.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-29config-gta02-no-gta03-ts.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-29register pcap7200 device on gta03.Matt Hsu
Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2008-12-29MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci-merge
pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage: From: Balaji Rao <balajirrao@openmoko.org> This patch gets the Linux mci stack to use the voltage it negotiated before with the uSD card on resume. Without this, it always reverts to and stays at 3.3V. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Filter AUX key bouncingNelson Castillo
This patch filters AUX key bouncing. We store the state of the AUX button and only change it when we notice that at least AUX_TIMER_CONSECUTIVE_EVENTS consecutive equal GPIO reads occur. This should solve #2185 (AUX button makes interrupt storm) but we still need the confirmation from someone affected by the IRQ storm. In my test setup I could see an improvement but I would only get 1 unwanted IRQ. The next step is to use the same timer for more keys. For that we could use the neo1973kbd_default_key_irq function for the AUX key also. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2008-12-29Move charger initialization from core to mbc driver.Balaji Rao
When irq_handler is called from core, the irqs might not have been yet registered - which means, the initial charger state was not being set properly. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Kill automatic charging restart to retain manual control.Balaji Rao
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Manually restart charger periodicallyBalaji Rao
This avoids excessive discharges seen in case of Li-ion batteries even when charger is connected. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Start charging when the usb current limit is changed.Balaji Rao
This makes sure that charging status remains correct when currrent limit is altered from userspace. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-18build-hide-hist-branch-tag.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-18fix-add-gratuiutous-pcf50633-timeout-tickle-in-isr.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-18fix-eint-breakage-by-fuzz.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-14MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatc ↵merge
hes-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 / 1231dc713a5825b92b6809aa417686c579e6a9f9 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 / 9c01cf722f0536f4827d76d36ee58c070b21c0da ... parent commitmessage: From: merge <null@invalid> MERGE-via-mokopatches-tracking-hist-MERGE-via-master-hist-1229249926 mokopatches-tracking-hist top was MERGE-via-master-hist-1229249926 / 8f700d425b380707d4f2b7052c1b1f7e77c8b7d3 ... parent commitmessage: From: merge <null@invalid> MERGE-mokopatches-tracking-patchset-edits
2008-12-14config-uplevel.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-12MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatc ↵merge
hes-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516-1229082771 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516-1229082771 / f410ecd0cc4642ae8b0f69c15fe349ea5639f5e2 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516 stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516 / 18f9a76ecc30ba8eee5de0627de3e7eb049775c3 ... parent commitmessage: From: merge <null@invalid> MERGE-via-mokopatches-tracking-hist-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488 mokopatches-tracking-hist top was MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488 / 7eb66508f95eeebbd7ad3487c5183b76524d4765 ... parent commitmessage: From: merge <null@invalid> MERGE-via-master-MERGE-via-master-hist-1229078937 master top was MERGE-via-master-hist-1229078937 / ff0b5902f29135a782a3bfb68e3429b86669aea4 ... parent commitmessage: From: merge <null@invalid> MERGE-master-patchset-edits
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:23:45 +0000