You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver update for 4.4-rc1. Lots of different driver and subsystem updates, hwtracing being the largest with the addition of some new platforms that are now supported. Full details in the shortlog. All of these have been in linux-next for a long time with no reported issues" * tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (181 commits) fpga: socfpga: Fix check of return value of devm_request_irq lkdtm: fix ACCESS_USERSPACE test mcb: Destroy IDA on module unload mcb: Do not return zero on error path in mcb_pci_probe() mei: bus: set the device name before running fixup mei: bus: use correct lock ordering mei: Fix debugfs filename in error output char: ipmi: ipmi_ssif: Replace timeval with timespec64 fpga: zynq-fpga: Fix issue with drvdata being overwritten. fpga manager: remove unnecessary null pointer checks fpga manager: ensure lifetime with of_fpga_mgr_get fpga: zynq-fpga: Change fw format to handle bin instead of bit. fpga: zynq-fpga: Fix unbalanced clock handling misc: sram: partition base address belongs to __iomem space coresight: etm3x: adding documentation for sysFS's cpu interface vme: 8-bit status/id takes 256 values, not 255 fpga manager: Adding FPGA Manager support for Xilinx Zynq 7000 ARM: zynq: dt: Updated devicetree for Zynq 7000 platform. ARM: dt: fpga: Added binding docs for Xilinx Zynq FPGA manager. ver_linux: proc/modules, limit text processing to 'sed' ...
This commit is contained in:
Linus Torvalds
@@ -185,6 +185,7 @@ int main(void)
|
||||
DEVID(mei_cl_device_id);
|
||||
DEVID_FIELD(mei_cl_device_id, name);
|
||||
DEVID_FIELD(mei_cl_device_id, uuid);
|
||||
DEVID_FIELD(mei_cl_device_id, version);
|
||||
|
||||
DEVID(rio_device_id);
|
||||
DEVID_FIELD(rio_device_id, did);
|
||||
|
||||
@@ -137,10 +137,12 @@ static inline void add_wildcard(char *str)
|
||||
static inline void add_uuid(char *str, uuid_le uuid)
|
||||
{
|
||||
int len = strlen(str);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
|
||||
sprintf(str + len, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
|
||||
uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
|
||||
uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
|
||||
uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
|
||||
uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1200,16 +1202,18 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias)
|
||||
}
|
||||
ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry);
|
||||
|
||||
/* Looks like: mei:S:uuid */
|
||||
/* Looks like: mei:S:uuid:N:* */
|
||||
static int do_mei_entry(const char *filename, void *symval,
|
||||
char *alias)
|
||||
{
|
||||
DEF_FIELD_ADDR(symval, mei_cl_device_id, name);
|
||||
DEF_FIELD_ADDR(symval, mei_cl_device_id, uuid);
|
||||
DEF_FIELD(symval, mei_cl_device_id, version);
|
||||
|
||||
sprintf(alias, MEI_CL_MODULE_PREFIX);
|
||||
sprintf(alias + strlen(alias), "%s:", (*name)[0] ? *name : "*");
|
||||
add_uuid(alias, *uuid);
|
||||
ADD(alias, ":", version != MEI_CL_VERSION_ANY, version);
|
||||
|
||||
strcat(alias, ":*");
|
||||
|
||||
|
||||
+145
-50
@@ -11,47 +11,95 @@ echo ' '
|
||||
uname -a
|
||||
echo ' '
|
||||
|
||||
gcc -dumpversion 2>&1| awk \
|
||||
'NR==1{print "Gnu C ", $1}'
|
||||
gcc -dumpversion 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("GNU C\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
make --version 2>&1 | awk -F, '{print $1}' | awk \
|
||||
'/GNU Make/{print "Gnu make ",$NF}'
|
||||
make --version 2>&1 |
|
||||
awk '/GNU Make/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("GNU Make\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
echo "binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')"
|
||||
ld -v 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Binutils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
echo -n "util-linux "
|
||||
fdformat --version | awk '{print $NF}' | sed -e s/^util-linux-// -e s/\)$//
|
||||
mount --version 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
$0 = substr($0,RSTART,RLENGTH)
|
||||
printf("Util-linux\t\t%s\nMount\t\t\t%s\n",$0,$0)
|
||||
}'
|
||||
|
||||
echo -n "mount "
|
||||
mount --version | awk '{print $NF}' | sed -e s/^mount-// -e s/\)$//
|
||||
depmod -V 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Module-init-tools\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
|
||||
tune2fs 2>&1 |
|
||||
awk '/^tune2fs/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("E2fsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \
|
||||
'NR==1 {print "e2fsprogs ", $2}'
|
||||
fsck.jfs -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Jfsutils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
fsck.jfs -V 2>&1 | grep version | sed 's/,//' | awk \
|
||||
'NR==1 {print "jfsutils ", $3}'
|
||||
|
||||
reiserfsck -V 2>&1 | grep ^reiserfsck | awk \
|
||||
'NR==1{print "reiserfsprogs ", $2}'
|
||||
reiserfsck -V 2>&1 |
|
||||
awk '/^reiserfsck/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Reiserfsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
|
||||
'NR==1{print "reiser4progs ", $2}'
|
||||
|
||||
xfs_db -V 2>&1 | grep version | awk \
|
||||
'NR==1{print "xfsprogs ", $3}'
|
||||
xfs_db -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Xfsprogs\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils ", $2}'
|
||||
pccardctl -V 2>&1 |
|
||||
awk '/pcmciautils/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Pcmciautils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
cardmgr -V 2>&1| grep version | awk \
|
||||
'NR==1{print "pcmcia-cs ", $3}'
|
||||
|
||||
quota -V 2>&1 | grep version | awk \
|
||||
'NR==1{print "quota-tools ", $NF}'
|
||||
quota -V 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Quota-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
pppd --version 2>&1| grep version | awk \
|
||||
'NR==1{print "PPP ", $3}'
|
||||
pppd --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("PPP\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
isdnctrl 2>&1 | grep version | awk \
|
||||
'NR==1{print "isdn4k-utils ", $NF}'
|
||||
@@ -59,40 +107,87 @@ isdnctrl 2>&1 | grep version | awk \
|
||||
showmount --version 2>&1 | grep nfs-utils | awk \
|
||||
'NR==1{print "nfs-utils ", $NF}'
|
||||
|
||||
echo -n "Linux C Library "
|
||||
sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps
|
||||
test -r /proc/self/maps &&
|
||||
sed '
|
||||
/.*libc-\(.*\)\.so$/!d
|
||||
s//Linux C Library\t\t\1/
|
||||
q
|
||||
' /proc/self/maps
|
||||
|
||||
ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
|
||||
'NR==1{print "Dynamic linker (ldd) ", $NF}'
|
||||
ldd --version 2>&1 |
|
||||
awk '/^ldd/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Dynamic linker (ldd)\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
ls -l /usr/lib/libg++.so /usr/lib/libstdc++.so 2>/dev/null | awk -F. \
|
||||
'{print "Linux C++ Library " $4"."$5"."$6}'
|
||||
libcpp=`ldconfig -p 2>/dev/null |
|
||||
awk '/(libg|stdc)[+]+\.so/ {
|
||||
print $NF
|
||||
exit
|
||||
}
|
||||
'`
|
||||
test -r "$libcpp" &&
|
||||
ls -l $libcpp |
|
||||
sed '
|
||||
s!.*so\.!!
|
||||
s!^!Linux C++ Library\t!
|
||||
'
|
||||
ps --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Procps\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
ps --version 2>&1 | grep version | awk \
|
||||
'NR==1{print "Procps ", $NF}'
|
||||
ifconfig --version 2>&1 |
|
||||
awk '/tools/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Net-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
ifconfig --version 2>&1 | grep tools | awk \
|
||||
'NR==1{print "Net-tools ", $NF}'
|
||||
|
||||
# Kbd needs 'loadkeys -h',
|
||||
loadkeys -h 2>&1 | awk \
|
||||
'(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}'
|
||||
|
||||
# while console-tools needs 'loadkeys -V'.
|
||||
loadkeys -V 2>&1 | awk \
|
||||
'(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}'
|
||||
loadkeys -V 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
$0 = substr($0,RSTART,RLENGTH)
|
||||
printf("Kbd\t\t\t%s\nConsole-tools\t\t%s\n",$0,$0)
|
||||
}'
|
||||
|
||||
oprofiled --version 2>&1 | awk \
|
||||
'(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}'
|
||||
|
||||
expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}'
|
||||
expr --v 2>&1 |
|
||||
awk '/^expr/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Sh-utils\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}'
|
||||
udevadm --version 2>&1 |
|
||||
awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Udev\t\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
iwconfig --version 2>&1 | awk \
|
||||
'(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}'
|
||||
iwconfig --version 2>&1 |
|
||||
awk '/version/{
|
||||
match($0, /[0-9]+([.]?[0-9]+)+/)
|
||||
printf("Wireless-tools\t\t%s\n",
|
||||
substr($0,RSTART,RLENGTH))
|
||||
}'
|
||||
|
||||
if [ -e /proc/modules ]; then
|
||||
X=`cat /proc/modules | sed -e "s/ .*$//"`
|
||||
echo "Modules Loaded "$X
|
||||
fi
|
||||
test -e /proc/modules &&
|
||||
sort /proc/modules |
|
||||
sed '
|
||||
s/ .*//
|
||||
H
|
||||
${
|
||||
g
|
||||
s/^\n/Modules Loaded\t\t/
|
||||
y/\n/ /
|
||||
q
|
||||
}
|
||||
d
|
||||
'
|
||||
|
||||
Reference in New Issue
Block a user