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

Commit 27a0464a authored by Lachlan McIlroy's avatar Lachlan McIlroy
Browse files

[XFS] Fix merge conflict in fs/xfs/xfs_rename.c 

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6



Conflicts:

	fs/xfs/xfs_rename.c

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parents 4d9d4ebf 3d44cc3e

Documentation/arm/mem_alignment

+1 −1
Original line number 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.



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

---		-----------------

Documentation/local_ops.txt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) 
	int cpu;



	/* Increment the counters */

	on_each_cpu(test_each, NULL, 0, 1);

	on_each_cpu(test_each, NULL, 1);

	/* Read all the counters */

	printk("Counters read from CPU %d\n", smp_processor_id());

	for_each_online_cpu(cpu) {

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


	STAC9227/9228/9229/927x

	  ref		Reference board

	  ref-no-jd	Reference board without HP/Mic jack detection

	  3stack	D965 3stack

	  5stack	D965 5stack + SPDIF

	  dell-3stack	Dell Dimension E520
@@ -1076,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


	STAC92HD73*

	  ref		Reference board

	  no-jd		BIOS setup but without jack-detection

	  dell-m6-amic	Dell desktops/laptops with analog mics

	  dell-m6-dmic	Dell desktops/laptops with digital mics

	  dell-m6	Dell desktops/laptops with both type of mics

Documentation/usb/gadget_serial.txt

+2 −2
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ modules. 
Then you must load the gadget serial driver.  To load it as an

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:



  modprobe g_serial

  modprobe g_serial use_acm=0



This will also automatically load the underlying gadget peripheral

controller driver.  This must be done each time you reboot the gadget

Documentation/usb/proc_usb_info.txt

+4 −2
Original line number 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

of first the device descriptor, then the descriptors for each

configuration of the device.  That information is also shown in

text form by the /proc/bus/usb/devices file, described later.

configuration of the device.  Multi-byte fields in the device and

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

devices.  You would open the /proc/bus/usb/BBB/DDD file read/write,