aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-20UBUNTU: ubuntu: AUFS -- sort out the relative header pathsAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- adapt to the new changelog handlingAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: security: unconditionally chain to Yama LSMKees Cook
This patch forces the LSM to always chain through the Yama LSM regardless of which LSM is selected as the primary LSM. This is not intended for upstream. This is, however, what Ubuntu and ChromeOS are doing. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: Yama: add link restrictionsKees Cook
Add symlink and hardlink restrictions that have shown real-world security benefits, along with sysctl knobs to control them. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: ata_piix: defer disks to the Hyper-V drivers by defaultAndy Whitcroft
When we are hosted on a Microsoft Hyper-V hypervisor the guest disks are exposed both via the Hyper-V paravirtualised drivers and via an emulated SATA disk drive. In this case we want to use the paravirtualised drivers if we can as they are much more efficient. Note that the Hyper-V paravirtualised drivers only expose the virtual hard disk devices, the CDROM/DVD devices must still be enumerated. Check the disk type when picking up its ID and if it appears to be a disk just report it disconnected. BugLink: http://bugs.launchpad.net/bugs/929545 BugLink: http://bugs.launchpad.net/bugs/942316 Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: Add vendor specific ID (0a5c 21f3) for BCM20702A0.Manoj Iyer
https://lkml.org/lkml/2012/2/2/220 T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=03 Dev#= 5 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0a5c ProdID=21f3 Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=74DE2B344A7B C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) BugLink: http://bugs.launchpad.net/bugs/925552 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Tested-by: Dennis Chua <dennis.chua@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: Bluetooth: Add support for BCM20702A0 [0a5c:21e6]James M. Leddy
Add another vendor specific ID for BCM20702A0. output of usb-devices: T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=04 Dev#= 6 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0a5c ProdID=21e6 Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=D0DF9AFB227B C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) BugLink: http://bugs.launchpad.net/bugs/906832 Signed-off-by: James M. Leddy <james.leddy@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: Bluetooth: Add support for BCM20702A0 [0a5c:21e1]Manoj Iyer
Add vendor specific ID for BCM20702A0. usb-devices: T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0a5c ProdID=21e1 Rev=01.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 S: SerialNumber=60D819F03A6D C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) BugLink: http://bugs.launchpad.net/bugs/906832 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: James M. Leddy <james.leddy@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: ensure debian/ is not excluded from git by defaultAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: ipv6: make the net.ipv6.conf.all.use_tempaddr sysctl ↵Mathieu Trudel-Lapierre
propagate to interface settings The description for IPV6_PRIVACY mentions using .../all/use_tempaddr to enable IPv6 Privacy Extensions, and IP sysctl documentation mentions 'all' as setting all interface-specific settings. We make sure at least use_tempaddr actually works as documented. Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- disable in favor of overlayfsAndy Whitcroft
Remain disabled while we acertain whether there are any hard requirements for aufs that overlayfs cannot handle. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- enable in config and makefileAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- suppress benign plink warning messagesAndy Whitcroft
We are getting a lot of bug reports for unexpectedly high plink counts. This message is benign and not worth reporting as a bug. Suppress. BugLink: http://bugs.launchpad.net/bugs/621195 Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- update to 4cf5db36bcd9748e8e7270022f295f84d1fc2245Andy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- fix undefined security_path_linkAndy Whitcroft
Fix: ERROR: "security_path_link" [ubuntu/aufs/aufs.ko] undefined! Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- fix undefined __devcgroup_inode_permissionAndy Whitcroft
Fix: ERROR: "__devcgroup_inode_permission" [ubuntu/aufs/aufs.ko] undefined! Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- aufs3-standalone.patchAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- aufs3-base.patchAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- documentation on updating aufs2Andy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- clean up the aufs updater and BOMAndy Whitcroft
Clean up the updater to record and use the real sha1 of the tip of the standalone tree as well as recording and tracking the nominal tip in the changelog for commit generation. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- update aufs-update to track new locations of headersAndy Whitcroft
Track the new location of the headers as per the commit below: commit de699ab60a2f8a55b9c8313a04c7863897fb88bd Author: Andy Whitcroft <apw@canonical.com> Date: Fri Dec 3 11:12:17 2010 +0000 UBUNTU: ubuntu: AUFS -- include the aufs_types.h file in linux-libc-headers Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- include the aufs_types.h file in linux-libc-headersAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/684666 Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: ubuntu: AUFS -- add BOM and automated update scriptAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: dell-wmi: Demote unknown WMI event message to pr_debugSeth Forshee
BugLink: http://bugs.launchpad.net/bugs/581312 This message is informational in nature but is causing users to think that there's a problem. Demote to pr_debug to silence it by default. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: include <linux/printk.h> and <stdarg.h> for mmc_core arm buildLeann Ogasawara
Fixes arm build failure: drivers/net/ethernet/stmicro/stmmac/mmc_core.c:142:2: error: implicit declaration of function 'pr_debug' [-Werror=implicit-function-declaration] include/linux/printk.h:47:2: error: unknown type name 'va_list' Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in itAndy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: [Config] Disable vt6656Tim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: [Config] Disabled dm-raid4-5Tim Gardner
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: headers_install: fix #include "..." usage for userspaceAndy Whitcroft
When headers are converted to userspace headers they may include relative includes. For example x86 has the following in its asm/posix_types.h: # ifdef __i386__ # include "posix_types_32.h" # else # include "posix_types_64.h" # endif However this is not safe in the face of the gcc option -I- which removes "the directory the file I am being included from" from the search list. Convert these references to <dir/...> form avoiding this. BugLink: http://bugs.launchpad.net/bugs/824377 Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6220 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/838402 The Dell Latitude E6220 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 990 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/768039 The Dell Optiplex 990 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: fireware: add NO_MSI quirks for o2micro controllerMing Lei
Disable MSI for the O2 Micro, Inc. firewire controller. BugLink: http://bugs.launchpad.net/bugs/801719 Upstream: http://marc.info/?t=131475896500002&r=1&w=2 Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 790 use reboot=pciLeann Ogasawara
BugLink: http://bugs.launchpad.net/bugs/818933 The Dell Optiplex 790 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6520 use reboot=pciLeann Ogasawara
The Dell Latitude E6520 doesn't reboot unless reboot=pci is set. BugLink: http://bugs.launchpad.net/bugs/833705 Cc: <stable@kernel.org> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-20UBUNTU: SAUCE: vt -- allow grub to request automatic vt_handoffAndy Whitcroft
Grub may be able to select a graphics mode and paint a splash screen for us. If so it needs to be able to tell us it has done so. Add support for detecting a new graphics mode selected bit in the screen_info passed over at boot. Use this to automatically enable vt_handoff mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: vt -- maintain bootloader screen mode and content until vt switchAndy Whitcroft
Introduce a new VT mode KD_TRANSPARENT which endevours to leave the current content of the framebuffer untouched. This allows the bootloader to insert a graphical splash and have the kernel maintain it until the OS splash can take over. When we finally switch away (either through programs like plymouth or manually) the content is lost and the VT reverts to text mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) vfs: Add a trace point in the mark_inode_dirty functionArjan van de Ven
[apw@canonical.com: This has no upstream traction but is used by powertop, so its worth carrying.] PowerTOP would like to be able to show who is keeping the disk busy by dirtying data. The most logical spot for this is in the vfs in the mark_inode_dirty() function. Doing this on the block level is not possible because by the time the IO hits the block layer the guilty party can no longer be found ("kjournald" and "pdflush" are not useful answers to "who caused this file to be dirty). The trace point follows the same logic/style as the block_dump code and pretty much dumps the same data, just not to dmesg (and thus to /var/log/messages) but via the trace events streams. Note: This patch was posted to lkml and might potentially go into 2.6.33 but I have not seen which maintainer will take it. Signed-of-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: (no-up) add tracing for user initiated readahead requestsAndy Whitcroft
Track pages which undergo readahead and for each record which were actually consumed, via either read or faulted into a map. This allows userspace readahead applications (such as ureadahead) to track which pages in core at the end of a boot are actually required and generate an optimal readahead pack. It also allows pack adjustment and optimisation in parallel with readahead, allowing the pack to evolve to be accurate as userspace paths change. The status of the pages are reported back via the mincore() call using a newly allocated bit. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: ubuntu: dm-raid4-5 fix up build failureLeann Ogasawara
ubuntu-2.6/ubuntu/dm-raid4-5/dm-raid4-5.c:1579:9: error: too many arguments to function 'dm_io_client_create' The above build failure was a result of upstream commit: commit bda8efec5c706a672e0714d341a342e811f0262a Author: Mikulas Patocka <mpatocka@redhat.com> Date: Sun May 29 13:03:09 2011 +0100 dm io: use fixed initial mempool size Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: Convert dm-raid45 to new block pluggingStefan Bader
Plugging for IOs to block devices was changed to an explicit, per task base. This converts the module to the new framework, fixing the compile failure. Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: S3 early resume debug via keyboard LEDsColin Ian King
Add support to debug S3 early resume by flashing the keyboard LEDs three times in the realmode path. This is useful to allow one to determine if S3 hangs occur in the BIOS or during the early resume phase. Add kernel parameter acpi_sleep=s3_leds to enable the s3 debugging option. This can also be enabled by writing 8 to /proc/sys/kernel/acpi_video_flags. Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: vesafb: enable mtrr WC by defaultThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 Move to enabling a write-combining MTRR by default, this then matches the uvesafb module. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not boolThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 As noted by the reporter the mtrr kernel command line option is actually a positive numeric not a boolean, move the module parameter we add to match. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: [arm] fixup __aeabi_uldivmod undefined build errorLeann Ogasawara
When building on arm we run into the following build error due to gcc-4.6 optimizing do_div into a uldivmod call: ERROR: "__aeabi_uldivmod" [drivers/scsi/megaraid/megaraid_sas.ko] undefined! Inline some assembly to prevent the compiler optimization. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: ubuntu: dm-raid4-5 -- follow changes to bio flagsAndy Whitcroft
commit 7b6d91daee5cac6402186ff224c3af39d79f4a0e Author: Christoph Hellwig <hch@lst.de> Date: Sat Aug 7 18:20:39 2010 +0200 block: unify flags for struct bio and struct request Follow the following transitions: bio_rw_flagged(bio, BIO_RW_BARRIER)) -> (bio->bi_rw & REQ_HARDBARRIER) -> (bio->bi_rw & REQ_FLUSH) Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: (no-up) add support for installed header files to ubuntu directoryAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/684666 We need the aufs headers in the linux-libc-headers, add support for including files from the ubuntu include directory. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20Revert "mmc: fix all hangs related to mmc/sd card insert/removal during ↵Andy Whitcroft
suspend/resume" This reverts commit 93cddb91e1a94859adfd99982b47da8328c3cfc1. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-20UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.Manoj Iyer
OriginalAuthor: Timo Aaltonen <tjaalton@ubuntu.com> BugLink: http://bugs.launchpad.net/bugs/348861 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com>
2012-06-20UBUNTU: SAUCE: drm -- stop early access to drm devicesAndy Whitcroft
When a drm driver is initialised we first allocate and initialise the drm minor numbers including creating the sysfs files, then we trigger the driver load method. The act of creating the sysfs files triggers the uevent. This means udev may start programs which open /dev/dri/card0 and other interfaces, this can occur before the load method has even started and thus before the driver has fully initialised its data structures. In the case of plymouthd this leads to it opening and closing (in disgust) the interface, which in turn leads to a kernel panic as the mutexes are yet to be initialised. This patch delays the linking up of the drm devices minor numbers until the driver is fully initialised. As it is possible for consumers of these interfaces to reach them before they are fully initialised we arrange for opens of these devices to return EAGAIN until the device is fully initialised. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2012-06-20UBUNTU: SAUCE: Improve Amazon EBS performance for EC2John Johansen
OriginalAuthor: Amazona from Ben Howard <behoward@amazon.com> BugLink: http://bugs.launchpad.net/bugs/634316 The pv-ops kernel suffers from poor performance when using Amazon's Elastic block storage (EBS). This patch from Amazon improves pv-ops kernel performance, and has not exhibited any regressions. Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:32:47 +0000