---

yaml
---
r: 143405
b: refs/heads/master
c: 8e255ba
h: refs/heads/master
i:
  143403: 3f01577
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1d07ed0e5b2707f786957c7a40eb2f399c84a8
+refs/heads/master: 8e255baa449df3049a8827a7f1f4f12b6921d0d1

trunk/Documentation/block/biodoc.txt

@@ -1040,21 +1040,23 @@ Front merges are handled by the binary trees in AS and deadline schedulers.
 iii. Plugging the queue to batch requests in anticipation of opportunities for
      merge/sort optimizations
 
+This is just the same as in 2.4 so far, though per-device unplugging
+support is anticipated for 2.5. Also with a priority-based i/o scheduler,
+such decisions could be based on request priorities.
+
 Plugging is an approach that the current i/o scheduling algorithm resorts to so
 that it collects up enough requests in the queue to be able to take
 advantage of the sorting/merging logic in the elevator. If the
 queue is empty when a request comes in, then it plugs the request queue
-(sort of like plugging the bath tub of a vessel to get fluid to build up)
+(sort of like plugging the bottom of a vessel to get fluid to build up)
 till it fills up with a few more requests, before starting to service
 the requests. This provides an opportunity to merge/sort the requests before
 passing them down to the device. There are various conditions when the queue is
 unplugged (to open up the flow again), either through a scheduled task or
 could be on demand. For example wait_on_buffer sets the unplugging going
-through sync_buffer() running blk_run_address_space(mapping). Or the caller
-can do it explicity through blk_unplug(bdev). So in the read case,
-the queue gets explicitly unplugged as part of waiting for completion on that
-buffer. For page driven IO, the address space ->sync_page() takes care of
-doing the blk_run_address_space().
+(by running tq_disk) so the read gets satisfied soon. So in the read case,
+the queue gets explicitly unplugged as part of waiting for completion,
+in fact all queues get unplugged as a side-effect.
 
 Aside:
   This is kind of controversial territory, as it's not clear if plugging is
@@ -1065,6 +1067,11 @@ Aside:
   multi-page bios being queued in one shot, we may not need to wait to merge
   a big request from the broken up pieces coming by.
 
+  Per-queue granularity unplugging (still a Todo) may help reduce some of the
+  concerns with just a single tq_disk flush approach. Something like
+  blk_kick_queue() to unplug a specific queue (right away ?)
+  or optionally, all queues, is in the plan.
+
 4.4 I/O contexts
 I/O contexts provide a dynamically allocated per process data area. They may
 be used in I/O schedulers, and in the block layer (could be used for IO statis,

trunk/Documentation/powerpc/dts-bindings/fsl/i2c.txt

@@ -7,42 +7,26 @@ Required properties :
 
 Recommended properties :
 
- - compatible : compatibility list with 2 entries, the first should
-   be "fsl,CHIP-i2c" where CHIP is the name of a compatible processor,
-   e.g. mpc8313, mpc8543, mpc8544, mpc5200 or mpc5200b. The second one
-   should be "fsl-i2c".
+ - compatible : Should be "fsl-i2c" for parts compatible with
+   Freescale I2C specifications.
  - interrupts : <a b> where a is the interrupt number and b is a
    field that represents an encoding of the sense and level
    information for the interrupt.  This should be encoded based on
    the information in section 2) depending on the type of interrupt
    controller you have.
  - interrupt-parent : the phandle for the interrupt controller that
    services interrupts for this device.
- - fsl,preserve-clocking : boolean; if defined, the clock settings
-   from the bootloader are preserved (not touched).
- - clock-frequency : desired I2C bus clock frequency in Hz.
-
-Examples :
-
-	i2c@3d00 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
-		cell-index = <0>;
-		reg = <0x3d00 0x40>;
-		interrupts = <2 15 0>;
-		interrupt-parent = <&mpc5200_pic>;
-		fsl,preserve-clocking;
+ - dfsrr : boolean; if defined, indicates that this I2C device has
+   a digital filter sampling rate register
+ - fsl5200-clocking : boolean; if defined, indicated that this device
+   uses the FSL 5200 clocking mechanism.
+
+Example :
+	i2c@3000 {
+		interrupt-parent = <40000>;
+		interrupts = <1b 3>;
+		reg = <3000 18>;
+		device_type = "i2c";
+		compatible  = "fsl-i2c";
+		dfsrr;
 	};
-
-	i2c@3100 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		cell-index = <1>;
-		compatible = "fsl,mpc8544-i2c", "fsl-i2c";
-		reg = <0x3100 0x100>;
-		interrupts = <43 2>;
-		interrupt-parent = <&mpic>;
-		clock-frequency = <400000>;
-	};
-

trunk/Documentation/sound/alsa/HD-Audio.txt

@@ -169,15 +169,15 @@ PCI SSID look-up.
 What `model` option values are available depends on the codec chip.
 Check your codec chip from the codec proc file (see "Codec Proc-File"
 section below).  It will show the vendor/product name of your codec
-chip.  Then, see Documentation/sound/alsa/HD-Audio-Models.txt file,
+chip.  Then, see Documentation/sound/alsa/HD-Audio-Modelstxt file,
 the section of HD-audio driver.  You can find a list of codecs
 and `model` options belonging to each codec.  For example, for Realtek
 ALC262 codec chip, pass `model=ultra` for devices that are compatible
 with Samsung Q1 Ultra.
 
 Thus, the first thing you can do for any brand-new, unsupported and
 non-working HD-audio hardware is to check HD-audio codec and several
-different `model` option values.  If you have any luck, some of them
+different `model` option values.  If you have a luck, some of them
 might suit with your device well.
 
 Some codecs such as ALC880 have a special model option `model=test`.

trunk/arch/mn10300/include/asm/bug.h

@@ -11,12 +11,10 @@
 #ifndef _ASM_BUG_H
 #define _ASM_BUG_H
 
-#ifdef CONFIG_BUG
-
 /*
  * Tell the user there is some problem.
  */
-#define BUG()							\
+#define _debug_bug_trap()					\
 do {								\
 	asm volatile(						\
 		"	syscall 15			\n"	\
@@ -27,11 +25,11 @@ do {								\
 		:						\
 		: "i"(__FILE__), "i"(__LINE__)			\
 		);						\
-} while (1)
+} while (0)
 
-#define HAVE_ARCH_BUG
-#endif /* CONFIG_BUG */
+#define BUG() _debug_bug_trap()
 
+#define HAVE_ARCH_BUG
 #include <asm-generic/bug.h>
 
 #endif /* _ASM_BUG_H */

trunk/arch/mn10300/include/asm/unistd.h

@@ -344,8 +344,6 @@
 #define __NR_dup3		331
 #define __NR_pipe2		332
 #define __NR_inotify_init1	333
-#define __NR_preadv		334
-#define __NR_pwritev		335
 
 #ifdef __KERNEL__
 

trunk/arch/mn10300/kernel/entry.S

@@ -723,8 +723,6 @@ ENTRY(sys_call_table)
 	.long sys_dup3
 	.long sys_pipe2
 	.long sys_inotify_init1
-	.long sys_preadv
-	.long sys_pwritev		/* 335 */
 
 
 nr_syscalls=(.-sys_call_table)/4

trunk/arch/mn10300/kernel/setup.c

@@ -136,6 +136,10 @@ void __init setup_arch(char **cmdline_p)
 	data_resource.start = virt_to_bus(&_etext);
 	data_resource.end = virt_to_bus(&_edata)-1;
 
+#define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
+#define PFN_PHYS(x)	((x) << PAGE_SHIFT)
+
 	start_pfn = (CONFIG_KERNEL_RAM_BASE_ADDRESS >> PAGE_SHIFT);
 	kstart_pfn = PFN_UP(__pa(&_text));
 	free_pfn = PFN_UP(__pa(&_end));

trunk/arch/powerpc/Kconfig

@@ -462,7 +462,7 @@ config PPC_64K_PAGES
 
 config PPC_256K_PAGES
 	bool "256k page size" if 44x
-	depends on !STDBINUTILS
+	depends on !STDBINUTILS && (!SHMEM || BROKEN)
 	help
 	  Make the page size 256k.
 

trunk/arch/powerpc/boot/dts/tqm8540.dts

@@ -84,9 +84,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {

trunk/arch/powerpc/boot/dts/tqm8541.dts

@@ -83,9 +83,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {

trunk/arch/powerpc/boot/dts/tqm8548-bigflash.dts

@@ -85,9 +85,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {
@@ -247,7 +247,7 @@
 			interrupts = <31 2 32 2 33 2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi2>;
-			phy-handle = <&phy4>;
+			phy-handle = <&phy3>;
 
 			mdio@520 {
 				#address-cells = <1>;
@@ -275,7 +275,7 @@
 			interrupts = <37 2 38 2 39 2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi3>;
-			phy-handle = <&phy5>;
+			phy-handle = <&phy4>;
 
 			mdio@520 {
 				#address-cells = <1>;

trunk/arch/powerpc/boot/dts/tqm8548.dts

@@ -85,9 +85,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {
@@ -247,7 +247,7 @@
 			interrupts = <31 2 32 2 33 2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi2>;
-			phy-handle = <&phy4>;
+			phy-handle = <&phy3>;
 
 			mdio@520 {
 				#address-cells = <1>;
@@ -275,7 +275,7 @@
 			interrupts = <37 2 38 2 39 2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi3>;
-			phy-handle = <&phy5>;
+			phy-handle = <&phy4>;
 
 			mdio@520 {
 				#address-cells = <1>;

trunk/arch/powerpc/boot/dts/tqm8555.dts

@@ -83,9 +83,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {

trunk/arch/powerpc/boot/dts/tqm8560.dts

@@ -85,9 +85,9 @@
 			interrupt-parent = <&mpic>;
 			dfsrr;
 
-			dtt@48 {
+			dtt@50 {
 				compatible = "national,lm75";
-				reg = <0x48>;
+				reg = <0x50>;
 			};
 
 			rtc@68 {