---

yaml
---
r: 15067
b: refs/heads/master
c: 2f9616d
h: refs/heads/master
i:
  15065: 380c305
  15063: 8d50f46
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 225bc8f1c7f534c01a4a8387b0d5fc9ee3830029
+refs/heads/master: 2f9616d4c44349c903bc1b54fe46ab0ce0210b74

trunk/Documentation/arm/00-INDEX

@@ -16,7 +16,5 @@ empeg
 	- Empeg documentation
 mem_alignment
 	- alignment abort handler documentation
-memory.txt
-	- description of the virtual memory layout
 nwfpe
 	- NWFPE floating point emulator documentation

trunk/arch/arm/kernel/ptrace.c

@@ -242,15 +242,6 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
 		 */
 		long aluop1, aluop2, ccbit;
 
-	        if ((insn & 0x0fffffd0) == 0x012fff10) {
-		        /*
-			 * bx or blx
-			 */
-			alt = get_user_reg(child, insn & 15);
-			break;
-		}
-
-
 		if ((insn & 0xf000) != 0xf000)
 			break;
 

trunk/arch/sparc/Makefile

@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
 # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
 INIT_Y		:= $(patsubst %/, %/built-in.o, $(init-y))
 CORE_Y		:= $(core-y)
-CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/
 CORE_Y		:= $(patsubst %/, %/built-in.o, $(CORE_Y))
 DRIVERS_Y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
 NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))

trunk/arch/sparc/lib/atomic32.c

@@ -66,6 +66,7 @@ int atomic_add_unless(atomic_t *v, int a, int u)
 	return ret != u;
 }
 
+static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 /* Atomic operations are already serializing */
 void atomic_set(atomic_t *v, int i)
 {

trunk/drivers/char/watchdog/mpcore_wdt.c

@@ -180,6 +180,10 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len,
 {
 	struct mpcore_wdt *wdt = file->private_data;
 
+	/*  Can't seek (pwrite) on this device  */
+	if (ppos != &file->f_pos)
+		return -ESPIPE;
+
 	/*
 	 *	Refresh the timer.
 	 */

trunk/drivers/mmc/mmc.c

@@ -932,9 +932,8 @@ static void mmc_read_scrs(struct mmc_host *host)
 
 		sg_init_one(&sg, (u8*)card->raw_scr, 8);
 
-		mmc_wait_for_req(host, &mrq);
-
-		if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
+		err = mmc_wait_for_req(host, &mrq);
+		if (err != MMC_ERR_NONE) {
 			mmc_card_set_dead(card);
 			continue;
 		}

trunk/drivers/serial/8250_pci.c

@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board,
 		break;
 	case 3:
 		offset = board->uart_offset;
-		/* FALLTHROUGH */
+		bar = 1;
 	case 4: /* BAR 2 */
 	case 5: /* BAR 3 */
 	case 6: /* BAR 4 */

trunk/drivers/video/bw2.c

@@ -121,6 +121,7 @@ struct bw2_par {
 	unsigned long		fbsize;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 /**

trunk/drivers/video/cg14.c

@@ -206,6 +206,7 @@ struct cg14_par {
 	int			mode;
 	int			ramsize;
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 static void __cg14_reset(struct cg14_par *par)

trunk/drivers/video/cg3.c

@@ -124,6 +124,7 @@ struct cg3_par {
 	unsigned long		fbsize;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 /**

trunk/drivers/video/cg6.c

@@ -265,6 +265,7 @@ struct cg6_par {
 	unsigned long		fbsize;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 static int cg6_sync(struct fb_info *info)
@@ -611,7 +612,7 @@ static void cg6_chip_init(struct fb_info *info)
 	struct cg6_par *par = (struct cg6_par *) info->par;
 	struct cg6_tec __iomem *tec = par->tec;
 	struct cg6_fbc __iomem *fbc = par->fbc;
-	u32 rev, conf, mode;
+	u32 rev, conf, mode, tmp;
 	int i;
 
 	/* Turn off stuff in the Transform Engine. */

trunk/drivers/video/ffb.c

@@ -359,6 +359,7 @@ struct ffb_par {
 	int			prom_parent_node;
 	int			dac_rev;
 	int			board_type;
+	struct list_head	list;
 };
 
 static void FFBFifo(struct ffb_par *par, int n)

trunk/drivers/video/leo.c

@@ -197,6 +197,7 @@ struct leo_par {
 	unsigned long		fbsize;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 static void leo_wait(struct leo_lx_krn __iomem *lx_krn)

trunk/drivers/video/p9100.c

@@ -140,6 +140,7 @@ struct p9100_par {
 	unsigned long		fbsize;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 /**

trunk/drivers/video/tcx.c

@@ -125,6 +125,7 @@ struct tcx_par {
 	int			lowdepth;
 
 	struct sbus_dev		*sdev;
+	struct list_head	list;
 };
 
 /* Reset control plane so that WID is 8-bit plane. */
@@ -443,7 +444,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
 
 	tcx_reset(&all->info);
 
-	tcx_blank(FB_BLANK_UNBLANK, &all->info);
+	tcx_blank(0, &all->info);
 
 	if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
 		printk(KERN_ERR "tcx: Could not allocate color map.\n");

trunk/include/asm-arm/arch-pxa/irq.h

@@ -12,3 +12,8 @@
 
 #define fixup_irq(x)	(x)
 
+/*
+ * This prototype is required for cascading of multiplexed interrupts.
+ * Since it doesn't exist elsewhere, we'll put it here for now.
+ */
+extern void do_IRQ(int irq, struct pt_regs *regs);

trunk/include/asm-arm/io.h

@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen);
 extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
 extern void __raw_writesl(void __iomem *addr, const void *data, int longlen);
 
-extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen);
-extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
-extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);
+extern void __raw_readsb(void __iomem *addr, void *data, int bytelen);
+extern void __raw_readsw(void __iomem *addr, void *data, int wordlen);
+extern void __raw_readsl(void __iomem *addr, void *data, int longlen);
 
 #define __raw_writeb(v,a)	(__chk_io_ptr(a), *(volatile unsigned char __force  *)(a) = (v))
 #define __raw_writew(v,a)	(__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v))

trunk/include/asm-arm/memory.h

@@ -122,7 +122,6 @@ static inline void *phys_to_virt(unsigned long x)
  */
 #define __pa(x)			__virt_to_phys((unsigned long)(x))
 #define __va(x)			((void *)__phys_to_virt((unsigned long)(x)))
-#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
 /*
  * Virtual <-> DMA view memory address translations

trunk/net/ipv4/netfilter/ip_nat_tftp.c

@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb,
 			 enum ip_conntrack_info ctinfo,
 			 struct ip_conntrack_expect *exp)
 {
-	exp->saved_proto.udp.port = exp->tuple.dst.u.tcp.port;
+	struct ip_conntrack *ct = exp->master;
+
+	exp->saved_proto.udp.port
+		= ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;
 	exp->dir = IP_CT_DIR_REPLY;
 	exp->expectfn = ip_nat_follow_master;
 	if (ip_conntrack_expect_related(exp) != 0)

trunk/net/ipv6/tcp_ipv6.c

@@ -992,12 +992,13 @@ static void tcp_v6_send_reset(struct sk_buff *skb)
 	/* sk = NULL, but it is safe for now. RST socket required. */
 	if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
 
-		if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
-			ip6_xmit(NULL, buff, &fl, NULL, 0);
-			TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
-			TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
+		if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0)
 			return;
-		}
+
+		ip6_xmit(NULL, buff, &fl, NULL, 0);
+		TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
+		TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
+		return;
 	}
 
 	kfree_skb(buff);
@@ -1056,11 +1057,11 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
 	fl.fl_ip_sport = t1->source;
 
 	if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
-		if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
-			ip6_xmit(NULL, buff, &fl, NULL, 0);
-			TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
+		if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0)
 			return;
-		}
+		ip6_xmit(NULL, buff, &fl, NULL, 0);
+		TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
+		return;
 	}
 
 	kfree_skb(buff);