Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c280266a authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into next

parents eddce368 55dac3a5
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
space, and might cause programs to fail unexpectedly.
space, and might cause programs to fail unexpectedly.


To change the alignment trap behavior, simply echo a number into
To change the alignment trap behavior, simply echo a number into
/proc/sys/debug/alignment.  The number is made up from various bits:
/proc/cpu/alignment.  The number is made up from various bits:


bit		behavior when set
bit		behavior when set
---		-----------------
---		-----------------
+2 −2
Original line number Original line Diff line number Diff line
@@ -114,11 +114,11 @@ modules.
Then you must load the gadget serial driver.  To load it as an
Then you must load the gadget serial driver.  To load it as an
ACM device (recommended for interoperability), do this:
ACM device (recommended for interoperability), do this:


  modprobe g_serial use_acm=1
  modprobe g_serial


To load it as a vendor specific bulk in/out device, do this:
To load it as a vendor specific bulk in/out device, do this:


  modprobe g_serial
  modprobe g_serial use_acm=0


This will also automatically load the underlying gadget peripheral
This will also automatically load the underlying gadget peripheral
controller driver.  This must be done each time you reboot the gadget
controller driver.  This must be done each time you reboot the gadget
+4 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,10 @@ it and 002/048 sometime later.


These files can be read as binary data.  The binary data consists
These files can be read as binary data.  The binary data consists
of first the device descriptor, then the descriptors for each
of first the device descriptor, then the descriptors for each
configuration of the device.  That information is also shown in
configuration of the device.  Multi-byte fields in the device and
text form by the /proc/bus/usb/devices file, described later.
configuration descriptors, but not other descriptors, are converted
to host endianness by the kernel.  This information is also shown
in text form by the /proc/bus/usb/devices file, described later.


These files may also be used to write user-level drivers for the USB
These files may also be used to write user-level drivers for the USB
devices.  You would open the /proc/bus/usb/BBB/DDD file read/write,
devices.  You would open the /proc/bus/usb/BBB/DDD file read/write,
+7 −5
Original line number Original line Diff line number Diff line
@@ -34,11 +34,12 @@ if usbmon is built into the kernel.
Verify that bus sockets are present.
Verify that bus sockets are present.


# ls /sys/kernel/debug/usbmon
# ls /sys/kernel/debug/usbmon
0s  0t  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u
0s  0u  1s  1t  1u  2s  2t  2u  3s  3t  3u  4s  4t  4u
#
#


Now you can choose to either use the sockets numbered '0' (to capture packets on
Now you can choose to either use the socket '0u' (to capture packets on all
all buses), and skip to step #3, or find the bus used by your device with step #2.
buses), and skip to step #3, or find the bus used by your device with step #2.
This allows to filter away annoying devices that talk continuously.


2. Find which bus connects to the desired device
2. Find which bus connects to the desired device


@@ -99,8 +100,9 @@ on the event type, but there is a set of words, common for all types.


Here is the list of words, from left to right:
Here is the list of words, from left to right:


- URB Tag. This is used to identify URBs is normally a kernel mode address
- URB Tag. This is used to identify URBs, and is normally an in-kernel address
 of the URB structure in hexadecimal.
  of the URB structure in hexadecimal, but can be a sequence number or any
  other unique string, within reason.


- Timestamp in microseconds, a decimal number. The timestamp's resolution
- Timestamp in microseconds, a decimal number. The timestamp's resolution
  depends on available clock, and so it can be much worse than a microsecond
  depends on available clock, and so it can be much worse than a microsecond
+4 −4
Original line number Original line Diff line number Diff line
@@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/
S:	Maintained
S:	Maintained


ECRYPT FILE SYSTEM
ECRYPT FILE SYSTEM
P:	Mike Halcrow, Phillip Hellewell
P:	Tyler Hicks, Dustin Kirkland
M:	mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
M:	tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
L:	ecryptfs-devel@lists.sourceforge.net
L:	ecryptfs-devel@lists.launchpad.net
W:	http://ecryptfs.sourceforge.net/
W:	https://launchpad.net/ecryptfs
S:	Supported
S:	Supported


EDAC-CORE
EDAC-CORE
Loading