* [PATCH -next] time, s390: get rid of compile warning
From: Heiko Carstens @ 2011-09-22 7:19 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: linux-next, Heiko Carstens, Martin Schwidefsky
"s390: Use direct ktime path for s390 clockevent device" in linux-next
introduces this compile warning:
arch/s390/kernel/time.c: In function 's390_next_ktime':
arch/s390/kernel/time.c:118:2: warning:
comparison of distinct pointer types lacks a cast [enabled by default]
Just use a u64 instead of an s64 variable. This is not a problem since it
will always contain a positive value.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/s390/kernel/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index c537164..8d65bd0 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -112,7 +112,7 @@ static void fixup_clock_comparator(unsigned long long delta)
static int s390_next_ktime(ktime_t expires,
struct clock_event_device *evt)
{
- s64 nsecs;
+ u64 nsecs;
nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset()));
do_div(nsecs, 125);
--
1.7.5.4
^ permalink raw reply related
* [PATCH -next] seeq: fix compile breakage on s390
From: Heiko Carstens @ 2011-09-22 7:17 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: linux-next, Heiko Carstens
The SEEQ drivers should depend on HAS_IOMEM to prevent compile breakage
on !HAS_IOMEM architectures:
drivers/net/ethernet/seeq/seeq8005.c: In function 'seeq8005_probe1':
drivers/net/ethernet/seeq/seeq8005.c:179:2: error:
implicit declaration of function 'inw' [-Werror=implicit-function-declaration]
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
drivers/net/ethernet/seeq/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
index 49b6d5b..29f1853 100644
--- a/drivers/net/ethernet/seeq/Kconfig
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -5,6 +5,7 @@
config NET_VENDOR_SEEQ
bool "SEEQ devices"
default y
+ depends on HAS_IOMEM
depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
--
1.7.5.4
^ permalink raw reply related
* [PATCH -next] pps gpio client: add missing dependency
From: Heiko Carstens @ 2011-09-22 7:16 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, Heiko Carstens, James Nuss
Add "depends on GENERIC_HARDIRQS" to avoid compile breakage on s390:
drivers/built-in.o: In function `pps_gpio_remove':
linux-next/drivers/pps/clients/pps-gpio.c:189: undefined reference to `free_irq'
Cc: James Nuss <jamesnuss@nanometrics.ca>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
drivers/pps/clients/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index c2e0f1e..445197d 100644
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -31,7 +31,7 @@ config PPS_CLIENT_PARPORT
config PPS_CLIENT_GPIO
tristate "PPS client using GPIO"
- depends on PPS
+ depends on PPS && GENERIC_HARDIRQS
help
If you say yes here you get support for a PPS source using
GPIO. To be useful you must also register a platform device
--
1.7.5.4
^ permalink raw reply related
* [PATCH -next] sysfs: add unsigned long cast to prevent compile warning
From: Heiko Carstens @ 2011-09-22 7:15 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-next, Heiko Carstens, Mikulas Patocka
"sysfs: use rb-tree for inode number lookup" added a new printk which
causes a new compile warning on s390 (and few other architectures):
fs/sysfs/dir.c: In function 'sysfs_link_sibling':
fs/sysfs/dir.c:63:4: warning: format '%lx' expects argument of type
'long unsigned int', but argument 2 has type 'ino_t' [-Wform
Add an explicit unsigned long cast since ino_t is an unsigned long on
most architectures.
Cc: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
fs/sysfs/dir.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index c3646d9..9a6e020 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -60,7 +60,8 @@ static void sysfs_link_sibling(struct sysfs_dirent *sd)
} else if (sd->s_ino > node->s_ino) {
p = &node->inode_node.rb_right;
} else {
- printk(KERN_CRIT "sysfs: inserting duplicate inode '%lx'\n", sd->s_ino);
+ printk(KERN_CRIT "sysfs: inserting duplicate inode '%lux'\n",
+ (unsigned long) sd->s_ino);
BUG();
}
#undef node
--
1.7.5.4
^ permalink raw reply related
* [PATCH] staging: dt3155v4l: fix build break
From: Marek Szyprowski @ 2011-09-22 7:04 UTC (permalink / raw)
To: linux-next, linux-kernel, linux-media
Cc: Mauro Carvalho Chehab, Greg Kroah-Hartman, Marin Mitov,
Marek Szyprowski
In-Reply-To: <20110922131232.56210b544f587210621ae339@canb.auug.org.au>
This patch fixes build break caused by commit ba7fcb0c9549 ("[media] media: vb2: dma
contig allocator: use dma_addr instread of paddr").
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/staging/dt3155v4l/dt3155v4l.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c
index 05aa41c..0ede5d1 100644
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@ -207,7 +207,7 @@ dt3155_start_acq(struct dt3155_priv *pd)
struct vb2_buffer *vb = pd->curr_buf;
dma_addr_t dma_addr;
- dma_addr = vb2_dma_contig_plane_paddr(vb, 0);
+ dma_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
iowrite32(dma_addr, pd->regs + EVEN_DMA_START);
iowrite32(dma_addr + img_width, pd->regs + ODD_DMA_START);
iowrite32(img_width, pd->regs + EVEN_DMA_STRIDE);
@@ -374,7 +374,7 @@ dt3155_irq_handler_even(int irq, void *dev_id)
ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
list_del(&ivb->done_entry);
ipd->curr_buf = ivb;
- dma_addr = vb2_dma_contig_plane_paddr(ivb, 0);
+ dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
iowrite32(dma_addr + img_width, ipd->regs + ODD_DMA_START);
iowrite32(img_width, ipd->regs + EVEN_DMA_STRIDE);
--
1.7.1.569.g6f426
^ permalink raw reply related
* linux-next: manual merge of the trivial tree with the arm-soc tree
From: Stephen Rothwell @ 2011-09-22 6:45 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Nicolas Pitre, Arnd Bergmann,
Justin P. Mattock
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-nuc93x/time.c between commit 6adc1e7ff19d ("ARM:
mach-nuc93x: delete") from the arm-soc tree and commit 699324871fcc
("treewide: remove extra semicolons from various parts of the kernel")
from the trivial tree.
The former removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the mmc tree
From: Stephen Rothwell @ 2011-09-22 6:13 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-next, linux-kernel, Jaehoon Chung, Adrian Hunter
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
Hi Chris,
After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/mmc/core/core.c: In function 'mmc_do_hw_reset':
drivers/mmc/core/core.c:1848:11: error: 'struct mmc_ios' has no member named 'ddr'
Caused by commit a0721d241b06 ("mmc: core: add eMMC hardware reset
support"). ddr was removed by commit 7fd781e8f9b7 ("mmc: remove unused
"ddr" parameter in struct mmc_ios") before v3.1-rc2.
Please build test ...
I have used the mmc tree from next-20110921 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the l2-mtd tree with the at91 tree
From: Stephen Rothwell @ 2011-09-22 5:36 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Jean-Christophe PLAGNIOL-VILLARD,
Dmitry Eremin-Solenikov, Nicolas Ferre
Hi Artem,
Today's linux-next merge of the l2-mtd tree got conflicts in
arch/arm/mach-at91/board-afeb-9260v1.c,
arch/arm/mach-at91/board-neocore926.c. arch/arm/mach-at91/board-rm9200dk.c,
arch/arm/mach-at91/board-sam9g20ek.c and
arch/arm/mach-at91/board-sam9m10g45ek.c between commit 36706ab70b26
("ARM: at91/boards: use -EINVAL for invalid gpio") from the at91 tree and
commit 1754aab9bb86 ("mtd: ATMEL, AVR32: inline nand partition table
access") from the l2-mtd tree.
Just context changes. I fixed them up (see below) and can carry the
fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
index 2d92043,a053e91..0000000
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@@ -142,9 -135,9 +136,10 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
.bus_width_16 = 0,
+ .det_pin = -EINVAL,
+ .parts = afeb9260_nand_partition,
+ .num_parts = ARRAY_SIZE(afeb9260_nand_partition),
};
diff --cc arch/arm/mach-at91/board-neocore926.c
index 0e6b86e,60f0cee..0000000
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -195,8 -188,8 +189,9 @@@ static struct atmel_nand_data __initdat
.rdy_pin = AT91_PIN_PB19,
.rdy_pin_active_low = 1,
.enable_pin = AT91_PIN_PD15,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = neocore926_nand_partition,
+ .num_parts = ARRAY_SIZE(neocore926_nand_partition),
};
static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-rm9200dk.c
index e34e84e,b5f2faf..0000000
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@@ -153,8 -143,9 +147,9 @@@ static struct atmel_nand_data __initdat
.cle = 21,
.det_pin = AT91_PIN_PB1,
.rdy_pin = AT91_PIN_PC2,
- // .enable_pin = ... not there
+ .enable_pin = -EINVAL,
- .partition_info = nand_partitions,
+ .parts = dk_nand_partition,
+ .num_parts = ARRAY_SIZE(dk_nand_partition),
};
#define DK_FLASH_BASE AT91_CHIPSELECT_0
diff --cc arch/arm/mach-at91/board-sam9g20ek.c
index 757d74f,0031227..0000000
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@@ -170,8 -163,8 +164,9 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
index e3694b1,00d041c..0000000
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@@ -150,8 -143,8 +144,9 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
^ permalink raw reply
* linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell @ 2011-09-22 5:16 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Kasper Pedersen, Matt Carlson
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/ethernet/broadcom/tg3.c between commit 5c1e688388f6 ("tg3:
fix VLAN tagging regression") from Linus' tree and commit 93a700a9d20b
("tg3: Code movement") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/broadcom/tg3.c
index 4a1374d,1485013..0000000
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@@ -6234,15 -6734,17 +6734,15 @@@ static netdev_tx_t tg3_start_xmit(struc
}
}
+ if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
+ !mss && skb->len > VLAN_ETH_FRAME_LEN)
+ base_flags |= TXD_FLAG_JMB_PKT;
+
-#ifdef BCM_KERNEL_SUPPORTS_8021Q
if (vlan_tx_tag_present(skb)) {
base_flags |= TXD_FLAG_VLAN;
vlan = vlan_tx_tag_get(skb);
}
-#endif
- if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
- !mss && skb->len > VLAN_ETH_FRAME_LEN)
- base_flags |= TXD_FLAG_JMB_PKT;
-
len = skb_headlen(skb);
mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
^ permalink raw reply
* linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2011-09-22 3:12 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Marek Szyprowski, Kyungmin Park
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
Hi Mauro,
After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type
Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
use dma_addr instread of paddr").
I have used the v4l-dvb tree from next-20110921 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: no tree for Sept 6
From: Mauro Carvalho Chehab @ 2011-09-22 2:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Randy Dunlap, linux-next
In-Reply-To: <20110922122352.61843f389e78c6ffde0a703b@canb.auug.org.au>
Em 21-09-2011 23:23, Stephen Rothwell escreveu:
> Hi Mauro,
>
> On Wed, 21 Sep 2011 22:54:12 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>>
>> Hi Stephen,
>>
>> Please replace my media tree (v4l-dvb) by this one:
>> git://linuxtv.org/mchehab/media-next.git
>
> I have switched to this from today.
Thank you!
>> I'll set soon a new tree for my edac patches as well.
>
> OK
>
Ok, just set a git tree for the edac drivers I'm maintaining.
It is at:
git://git.infradead.org/users/mchehab/edac.git
It replaces both my old i7core and edac trees.
Could you please replace it for the linux-next builds?
It contains the fix for the compilation error on i386, as reported by Randy.
Thanks!
Mauro
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Nicolas Pitre @ 2011-09-22 2:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next, linux-kernel, Sascha Hauer,
Russell King
In-Reply-To: <20110922114923.86a2325300e87eeaef151b1a@canb.auug.org.au>
On Thu, 22 Sep 2011, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-nuc93x/Makefile.boot between commit 86783a0c544d ("ARM:
> 7022/1: allow to detect conflicting zreladdrs") from the arm tree and
> commit 6adc1e7ff19d ("ARM: mach-nuc93x: delete") from the arm-soc tree.
>
> The latter removes the file that the former updates, so i did that.
That is correct.
Nicolas
^ permalink raw reply
* Re: linux-next: no tree for Sept 6
From: Stephen Rothwell @ 2011-09-22 2:23 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Arnaud Lacombe, Josh Boyer, linux-next, LKML
In-Reply-To: <4E7A9544.9040006@infradead.org>
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
Hi Mauro,
On Wed, 21 Sep 2011 22:54:12 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Hi Stephen,
>
> Please replace my media tree (v4l-dvb) by this one:
> git://linuxtv.org/mchehab/media-next.git
I have switched to this from today.
> I'll set soon a new tree for my edac patches as well.
OK
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2011-09-22 2:08 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Linus Walleij, Russell King
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
drivers/gpio/Makefile between commit 2428835fc6a5 ("ARM: 7049/1:
mach-sa1100: move SA1100 GPIO driver to GPIO subsystem") from the arm
tree and commit 1b39d5f2cc5c ("gpio/samsung: gpio-samsung.c to support
Samsung GPIOs") from the s5p tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpio/Makefile
index 84bc738,62db458..0000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5
obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o
+obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o
obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o
obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o
obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
+obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o
obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o
+obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o
obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o
@@@ -41,11 -37,7 +40,8 @@@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf8
obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
-
- obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o
- obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o
- obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o
+obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
+ obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o
obj-$(CONFIG_GPIO_SCH) += gpio-sch.o
obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o
obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o
^ permalink raw reply
* Re: linux-next: no tree for Sept 6
From: Mauro Carvalho Chehab @ 2011-09-22 1:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Arnaud Lacombe, Josh Boyer, linux-next, LKML
In-Reply-To: <20110911141958.8e404c8b943af1c73886cee5@canb.auug.org.au>
Em 11-09-2011 01:19, Stephen Rothwell escreveu:
> Hi Mauro,
>
> On Wed, 07 Sep 2011 11:08:53 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>>
>> It seems that we need a backup plan. In my case, I could put the tree
>> for -next at infradead or at linuxtv, but that means to re-configure
>> everything at Stephen's side.
>
> That is not a big issue at all. If you wish to move your tree, just let
> me know (preferably in a public manner to raise my confidence in its
> provenance - I am a bit more paranoid, now :-)).
Hi Stephen,
Please replace my media tree (v4l-dvb) by this one:
git://linuxtv.org/mchehab/media-next.git
I'll set soon a new tree for my edac patches as well.
Thank you!
Mauro
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-09-22 1:49 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Sascha Hauer, Nicolas Pitre,
Russell King
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-nuc93x/Makefile.boot between commit 86783a0c544d ("ARM:
7022/1: allow to detect conflicting zreladdrs") from the arm tree and
commit 6adc1e7ff19d ("ARM: mach-nuc93x: delete") from the arm-soc tree.
The latter removes the file that the former updates, so i did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: tmem: temporary home for tmem.git tree (for frontswap, which is the final core kernel patchset for tmem)
From: Stephen Rothwell @ 2011-09-22 1:24 UTC (permalink / raw)
To: Dan Magenheimer; +Cc: linux-next, linux-kernel, Konrad Wilk, akpm
In-Reply-To: <b6034dd3-1750-49b5-b466-c125c9704db2@default>
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
Hi Dan,
On Wed, 21 Sep 2011 12:18:19 -0700 (PDT) Dan Magenheimer <dan.magenheimer@oracle.com> wrote:
>
> There's a few tweaks in the tmem/frontswap patchset (for which
> the current version was last pulled into linux-next from kernel.org).
> Changes are mostly cosmetic and mostly in response to feedback from
> Andrew Morton, with a bit of patchset restructuring suggested by
> Konrad Wilk. I've been hoping that kernel.org would come back up
> but if it's not too much trouble to switch temporarily, please
> switch tmem to:
>
> git://oss.oracle.com/git/djm/tmem.git#tmem
>
> I would appreciate having the exposure on the latest bits
> before the 3.2 merge window.
I will switch to that tree from today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: New location of mmc-next while kernel.org is down
From: Stephen Rothwell @ 2011-09-22 1:21 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-kernel, linux-next, linux-mmc
In-Reply-To: <m2wrd14wg2.fsf@bob.laptop.org>
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
Hi Chris,
On Wed, 21 Sep 2011 13:49:49 -0400 Chris Ball <cjb@laptop.org> wrote:
>
> Please switch the mmc-next location for linux-next over to:
>
> git://dev.laptop.org/users/cjb/mmc mmc-next
OK, I have switched from today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: Adding hwspinlock-next to linux-next
From: Stephen Rothwell @ 2011-09-22 1:18 UTC (permalink / raw)
To: Ohad Ben-Cohen; +Cc: linux-kernel, linux-next
In-Reply-To: <CAK=WgbaPkTpsp-Zp9FCQW5t4dMp6ogJtzL4nOgR73wErrvg8Ng@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1876 bytes --]
Hi Ohad,
On Wed, 21 Sep 2011 20:22:56 +0300 Ohad Ben-Cohen <ohad@wizery.com> wrote:
>
> Can you please add the following hwspinlock tree to linux-next ?
>
> git://github.com/ohadbc/hwspinlock-next.git linux-next
I have added that from today.
> (I'll most likely switch to kernel.org once it's up again)
Understood.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* [PATCH -next] rtlwifi: rtl8192c: Add includes of export.h
From: Larry Finger @ 2011-09-21 22:22 UTC (permalink / raw)
To: paul.gortmaker; +Cc: linux-wireless, linux-kernel, linux-next, sfr, akpm
With the split of include/linux/module.h into two parts, several files in
drivers rtlwifi and rtl8192c need to include the new file.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
Paul,
At Randy Dunlap's suggestion, I am sending this to you in hopes that
I can save you some time. I think I found all the routines that will have
a problem, but as these patches do not compile, I cannot be sure.
Larry
---
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/base.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/base.c
@@ -30,6 +30,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/ip.h>
+#include <linux/export.h>
#include "wifi.h"
#include "rc.h"
#include "base.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/cam.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/cam.c
@@ -29,6 +29,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/export.h>
+
#include "wifi.h"
#include "cam.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/efuse.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/efuse.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "wifi.h"
#include "efuse.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/pci.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "core.h"
#include "wifi.h"
#include "pci.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/ps.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/ps.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "wifi.h"
#include "base.h"
#include "ps.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "dm_common.h"
#include "phy_common.h"
#include "../pci.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -30,6 +30,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/firmware.h>
+#include <linux/export.h>
+
#include "../wifi.h"
#include "../pci.h"
#include "../base.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/export.h>
+
#include "../wifi.h"
#include "../rtl8192ce/reg.h"
#include "../rtl8192ce/def.h"
Index: wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/rtlwifi/usb.c
+++ wireless-testing-new/drivers/net/wireless/rtlwifi/usb.c
@@ -28,6 +28,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/usb.h>
+#include <linux/export.h>
+
#include "core.h"
#include "wifi.h"
#include "usb.h"
^ permalink raw reply
* Re: [PATCH -next] bcma: main.c and driver_mips.c need linux/export.h
From: Randy Dunlap @ 2011-09-21 21:49 UTC (permalink / raw)
To: Larry Finger
Cc: Rafał Miłecki, Andrew Morton, Stephen Rothwell,
linux-next, LKML, linux-wireless@vger.kernel.org, Paul Gortmaker
In-Reply-To: <4E7A5A2F.7030402@lwfinger.net>
On 09/21/2011 02:42 PM, Larry Finger wrote:
> On 09/21/2011 04:07 PM, Randy Dunlap wrote:
>> From: Randy Dunlap<rdunlap@xenotime.net>
>>
>> main.c and driver_mips.c use EXPORT_SYMBOL() etc.
>> so they should include<linux/export.h>.
>>
>> Signed-off-by: Randy Dunlap<rdunlap@xenotime.net>
>
> From this commit message, it appears that every routine that uses EXPORT_SYMBOL() will need to include this header. I looked at modifying rtlwifi and friends to include this header, but found that include/linux/export.h does not exist in any of my source trees. From that I assume that the change will happen in 3.2.
>
> I have prepared a patch, but cannot use it at the moment. Is there somewhere that I should send it?
Hi Larry,
linux/export.h is only in linux-next. I think that you should just prepare
a linux-next patch for rtlwifi and then push it after Paul Gortmaker's
module.h-split git tree has been merged (it splits module.h into module.h
and export.h), or maybe you could ask Paul to merge your patch into his tree.
[I added Paul to the cc: list.]
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH -next] bcma: main.c and driver_mips.c need linux/export.h
From: Larry Finger @ 2011-09-21 21:42 UTC (permalink / raw)
To: Randy Dunlap
Cc: Rafał Miłecki, Andrew Morton, Stephen Rothwell,
linux-next, LKML, linux-wireless@vger.kernel.org
In-Reply-To: <4E7A521B.50104@xenotime.net>
On 09/21/2011 04:07 PM, Randy Dunlap wrote:
> From: Randy Dunlap<rdunlap@xenotime.net>
>
> main.c and driver_mips.c use EXPORT_SYMBOL() etc.
> so they should include<linux/export.h>.
>
> Signed-off-by: Randy Dunlap<rdunlap@xenotime.net>
From this commit message, it appears that every routine that uses
EXPORT_SYMBOL() will need to include this header. I looked at modifying rtlwifi
and friends to include this header, but found that include/linux/export.h does
not exist in any of my source trees. From that I assume that the change will
happen in 3.2.
I have prepared a patch, but cannot use it at the moment. Is there somewhere
that I should send it?
Larry
^ permalink raw reply
* [PATCH -next] bcma: main.c and driver_mips.c need linux/export.h
From: Randy Dunlap @ 2011-09-21 21:07 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Andrew Morton, Stephen Rothwell, linux-next, LKML,
linux-wireless@vger.kernel.org
In-Reply-To: <CACna6ryNw+YgTiO5dBSGcTfUabM_yO0LaSsbGpC_X6JrQudnBQ@mail.gmail.com>
From: Randy Dunlap <rdunlap@xenotime.net>
main.c and driver_mips.c use EXPORT_SYMBOL() etc.
so they should include <linux/export.h>.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
drivers/bcma/driver_mips.c | 1 +
drivers/bcma/main.c | 1 +
2 files changed, 2 insertions(+)
--- next-2011-0921.orig/drivers/bcma/driver_mips.c
+++ next-2011-0921/drivers/bcma/driver_mips.c
@@ -14,6 +14,7 @@
#include <linux/bcma/bcma.h>
+#include <linux/export.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/serial_reg.h>
--- next-2011-0921.orig/drivers/bcma/main.c
+++ next-2011-0921/drivers/bcma/main.c
@@ -7,6 +7,7 @@
#include "bcma_private.h"
#include <linux/module.h>
+#include <linux/export.h>
#include <linux/bcma/bcma.h>
#include <linux/slab.h>
^ permalink raw reply
* linux-next: tmem: temporary home for tmem.git tree (for frontswap, which is the final core kernel patchset for tmem)
From: Dan Magenheimer @ 2011-09-21 19:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Konrad Wilk, akpm
Hi Stephen --
There's a few tweaks in the tmem/frontswap patchset (for which
the current version was last pulled into linux-next from kernel.org).
Changes are mostly cosmetic and mostly in response to feedback from
Andrew Morton, with a bit of patchset restructuring suggested by
Konrad Wilk. I've been hoping that kernel.org would come back up
but if it's not too much trouble to switch temporarily, please
switch tmem to:
git://oss.oracle.com/git/djm/tmem.git#tmem
I would appreciate having the exposure on the latest bits
before the 3.2 merge window.
Thanks!
Dan
Thanks... for the memory!
I really could use more / my throughput's on the floor
The balloon is flat / my swap disk's fat / I've OOM's in store
Overcommitted so much
(with apologies to Bob Hope)
^ permalink raw reply
* [PATCH -next] nfc: NFC_WILINK depends on NFC_NCI
From: Randy Dunlap @ 2011-09-21 18:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, Lauro Ramos Venancio,
Aloisio Almeida Jr, Samuel Ortiz, linux-wireless@vger.kernel.org
In-Reply-To: <20110921155850.09c858bb38205bb2cc0c8f0a@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
nwcwilink.c uses nci_*() interfaces, so it should depend on
NFC_NCI.
Fixes these build errors:
ERROR: "nci_register_device" [drivers/nfc/nfcwilink.ko] undefined!
ERROR: "nci_allocate_device" [drivers/nfc/nfcwilink.ko] undefined!
ERROR: "nci_recv_frame" [drivers/nfc/nfcwilink.ko] undefined!
ERROR: "nci_free_device" [drivers/nfc/nfcwilink.ko] undefined!
ERROR: "nci_unregister_device" [drivers/nfc/nfcwilink.ko] undefined!
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
drivers/nfc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-0921.orig/drivers/nfc/Kconfig
+++ next-2011-0921/drivers/nfc/Kconfig
@@ -29,7 +29,7 @@ config NFC_PN533
config NFC_WILINK
tristate "Texas Instruments NFC WiLink driver"
- depends on TI_ST
+ depends on TI_ST && NFC_NCI
help
This enables the NFC driver for Texas Instrument's BT/FM/GPS/NFC
combo devices. This makes use of shared transport line discipline
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox