* linux-next: manual merge of the trivial tree with the kernel-doc tree
From: Stephen Rothwell @ 2011-09-19 6:39 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Amos Kong, Randy Dunlap, Paul Bolle
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/PCI/pci.txt between commit b814f0357fbe
("Documentation/PCI/pci.txt: fix a reference doc name") from the
kernel-doc tree and commit c460578a674f ("Documentation: fix broken
references") from the trivial tree.
It looks like the former supercedes the latter, so I used 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: manual merge of the fbdev tree with the mips tree
From: Stephen Rothwell @ 2011-09-19 6:22 UTC (permalink / raw)
To: Florian Tobias Schandinat, linux-fbdev
Cc: linux-next, linux-kernel, Manuel Lauss, Ralf Baechle, Paul Mundt
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in
drivers/video/Kconfig between commit 9d7dec27ace1 ("MIPS: Alchemy: remove
all CONFIG_SOC_AU1??? defines") from the mips tree and commit
4ee584615102 ("au1200fb: switch to FB_SYS helpers") from the fbdev 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/video/Kconfig
index 55a7df4,8165c55..0000000
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -1755,10 -1764,11 +1764,11 @@@ config FB_AU110
config FB_AU1200
bool "Au1200 LCD Driver"
- depends on (FB = y) && MIPS && SOC_AU1200
+ depends on (FB = y) && MIPS_ALCHEMY
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
+ select FB_SYS_FILLRECT
+ select FB_SYS_COPYAREA
+ select FB_SYS_IMAGEBLIT
+ select FB_SYS_FOPS
help
This is the framebuffer driver for the AMD Au1200 SOC. It can drive
various panels and CRTs by passing in kernel cmd line option
^ permalink raw reply
* linux-next: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2011-09-19 6:19 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-next, linux-kernel, "Uwe Kleine-König"
[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]
Hi Samuel,
After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/regulator/mc13783-regulator.c: In function 'mc13783_regulator_probe':
drivers/regulator/mc13783-regulator.c:347:9: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:355:23: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:356:21: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:358:34: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c:359:26: error: dereferencing pointer to incomplete type
drivers/regulator/mc13783-regulator.c: In function 'mc13783_regulator_remove':
drivers/regulator/mc13783-regulator.c:390:23: error: dereferencing pointer to incomplete type
Caused by commit a7e5c9a30148 ("mfd: Remove mc13783 API functions and
symbols").
I have used the mfd tree from next-20110915 again today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sound tree with the mips tree
From: Stephen Rothwell @ 2011-09-19 5:38 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Manuel Lauss, Mark Brown, Ralf Baechle
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/mips/alchemy/devboards/db1x00/platform.c between several commits
from the mips tree and commit b2ce305dda48 ("ASoC: Add a DB1x00 AC97
machine driver") from the sound tree.
Mainly context changes. I fixed it up (I think - see below) and can
carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/alchemy/devboards/db1x00/platform.c
index 8704865,7057d28..0000000
--- a/arch/mips/alchemy/devboards/db1x00/platform.c
+++ b/arch/mips/alchemy/devboards/db1x00/platform.c
@@@ -19,10 -19,12 +19,12 @@@
*/
#include <linux/init.h>
+#include <linux/dma-mapping.h>
+ #include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <asm/mach-au1x00/au1000.h>
+ #include <asm/mach-au1x00/au1000_dma.h>
-#include <asm/mach-au1x00/au1xxx.h>
#include <asm/mach-db1x00/bcsr.h>
#include "../platform.h"
@@@ -88,182 -88,79 +90,227 @@@ struct pci_dev
#endif
#endif
+#ifdef CONFIG_PCI
+#ifdef CONFIG_MIPS_DB1500
+static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+ if ((slot < 12) || (slot > 13) || pin == 0)
+ return -1;
+ if (slot == 12)
+ return (pin == 1) ? AU1500_PCI_INTA : 0xff;
+ if (slot == 13) {
+ switch (pin) {
+ case 1: return AU1500_PCI_INTA;
+ case 2: return AU1500_PCI_INTB;
+ case 3: return AU1500_PCI_INTC;
+ case 4: return AU1500_PCI_INTD;
+ }
+ }
+ return -1;
+}
+#endif
+
+#ifdef CONFIG_MIPS_DB1550
+static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+ if ((slot < 11) || (slot > 13) || pin == 0)
+ return -1;
+ if (slot == 11)
+ return (pin == 1) ? AU1550_PCI_INTC : 0xff;
+ if (slot == 12) {
+ switch (pin) {
+ case 1: return AU1550_PCI_INTB;
+ case 2: return AU1550_PCI_INTC;
+ case 3: return AU1550_PCI_INTD;
+ case 4: return AU1550_PCI_INTA;
+ }
+ }
+ if (slot == 13) {
+ switch (pin) {
+ case 1: return AU1550_PCI_INTA;
+ case 2: return AU1550_PCI_INTB;
+ case 3: return AU1550_PCI_INTC;
+ case 4: return AU1550_PCI_INTD;
+ }
+ }
+ return -1;
+}
+#endif
+
+#ifdef CONFIG_MIPS_BOSPORUS
+static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+ if ((slot < 11) || (slot > 13) || pin == 0)
+ return -1;
+ if (slot == 12)
+ return (pin == 1) ? AU1500_PCI_INTA : 0xff;
+ if (slot == 11) {
+ switch (pin) {
+ case 1: return AU1500_PCI_INTA;
+ case 2: return AU1500_PCI_INTB;
+ default: return 0xff;
+ }
+ }
+ if (slot == 13) {
+ switch (pin) {
+ case 1: return AU1500_PCI_INTA;
+ case 2: return AU1500_PCI_INTB;
+ case 3: return AU1500_PCI_INTC;
+ case 4: return AU1500_PCI_INTD;
+ }
+ }
+ return -1;
+}
+#endif
+
+#ifdef CONFIG_MIPS_MIRAGE
+static int db1xxx_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+ if ((slot < 11) || (slot > 13) || pin == 0)
+ return -1;
+ if (slot == 11)
+ return (pin == 1) ? AU1500_PCI_INTD : 0xff;
+ if (slot == 12)
+ return (pin == 3) ? AU1500_PCI_INTC : 0xff;
+ if (slot == 13) {
+ switch (pin) {
+ case 1: return AU1500_PCI_INTA;
+ case 2: return AU1500_PCI_INTB;
+ default: return 0xff;
+ }
+ }
+ return -1;
+}
+#endif
+
+static struct resource alchemy_pci_host_res[] = {
+ [0] = {
+ .start = AU1500_PCI_PHYS_ADDR,
+ .end = AU1500_PCI_PHYS_ADDR + 0xfff,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct alchemy_pci_platdata db1xxx_pci_pd = {
+ .board_map_irq = db1xxx_map_pci_irq,
+};
+
+static struct platform_device db1xxx_pci_host_dev = {
+ .dev.platform_data = &db1xxx_pci_pd,
+ .name = "alchemy-pci",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(alchemy_pci_host_res),
+ .resource = alchemy_pci_host_res,
+};
+
+static int __init db15x0_pci_init(void)
+{
+ return platform_device_register(&db1xxx_pci_host_dev);
+}
+/* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */
+arch_initcall(db15x0_pci_init);
+#endif
+
+#ifdef CONFIG_MIPS_DB1100
+static struct resource au1100_lcd_resources[] = {
+ [0] = {
+ .start = AU1100_LCD_PHYS_ADDR,
+ .end = AU1100_LCD_PHYS_ADDR + 0x800 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = AU1100_LCD_INT,
+ .end = AU1100_LCD_INT,
+ .flags = IORESOURCE_IRQ,
+ }
+};
+
+static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);
+
+static struct platform_device au1100_lcd_device = {
+ .name = "au1100-lcd",
+ .id = 0,
+ .dev = {
+ .dma_mask = &au1100_lcd_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ .num_resources = ARRAY_SIZE(au1100_lcd_resources),
+ .resource = au1100_lcd_resources,
+};
+#endif
+
+ static struct resource alchemy_ac97c_res[] = {
+ [0] = {
+ .start = AU1000_AC97_PHYS_ADDR,
+ .end = AU1000_AC97_PHYS_ADDR + 0xfff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = DMA_ID_AC97C_TX,
+ .end = DMA_ID_AC97C_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ [2] = {
+ .start = DMA_ID_AC97C_RX,
+ .end = DMA_ID_AC97C_RX,
+ .flags = IORESOURCE_DMA,
+ },
+ };
+
+ static struct platform_device alchemy_ac97c_dev = {
+ .name = "alchemy-ac97c",
+ .id = -1,
+ .resource = alchemy_ac97c_res,
+ .num_resources = ARRAY_SIZE(alchemy_ac97c_res),
+ };
+
+ static struct platform_device alchemy_ac97c_dma_dev = {
+ .name = "alchemy-pcm-dma",
+ .id = 0,
+ };
+
+ static struct platform_device db1x00_codec_dev = {
+ .name = "ac97-codec",
+ .id = -1,
+ };
+
+ static struct platform_device db1x00_audio_dev = {
+ .name = "db1000-audio",
+ };
+
static int __init db1xxx_dev_init(void)
{
#ifdef DB1XXX_HAS_PCMCIA
- db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR,
- PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
- PCMCIA_MEM_PHYS_ADDR,
- PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
- PCMCIA_IO_PHYS_ADDR,
- PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
- DB1XXX_PCMCIA_CARD0,
- DB1XXX_PCMCIA_CD0,
- /*DB1XXX_PCMCIA_STSCHG0*/0,
- 0,
- 0);
-
- db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
- PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
- PCMCIA_MEM_PHYS_ADDR + 0x004000000,
- PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1,
- PCMCIA_IO_PHYS_ADDR + 0x004000000,
- PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1,
- DB1XXX_PCMCIA_CARD1,
- DB1XXX_PCMCIA_CD1,
- /*DB1XXX_PCMCIA_STSCHG1*/0,
- 0,
- 1);
+ db1x_register_pcmcia_socket(
+ AU1000_PCMCIA_ATTR_PHYS_ADDR,
+ AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
+ AU1000_PCMCIA_MEM_PHYS_ADDR,
+ AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
+ AU1000_PCMCIA_IO_PHYS_ADDR,
+ AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
+ DB1XXX_PCMCIA_CARD0, DB1XXX_PCMCIA_CD0,
+ /*DB1XXX_PCMCIA_STSCHG0*/0, 0, 0);
+
+ db1x_register_pcmcia_socket(
+ AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
+ AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+ AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004000000,
+ AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1,
+ AU1000_PCMCIA_IO_PHYS_ADDR + 0x004000000,
+ AU1000_PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1,
+ DB1XXX_PCMCIA_CARD1, DB1XXX_PCMCIA_CD1,
+ /*DB1XXX_PCMCIA_STSCHG1*/0, 0, 1);
+#endif
+#ifdef CONFIG_MIPS_DB1100
+ platform_device_register(&au1100_lcd_device);
#endif
db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);
+
+ platform_device_register(&db1x00_codec_dev);
+ platform_device_register(&alchemy_ac97c_dma_dev);
+ platform_device_register(&alchemy_ac97c_dev);
+ platform_device_register(&db1x00_audio_dev);
+
return 0;
}
device_initcall(db1xxx_dev_init);
^ permalink raw reply
* linux-next: manual merge of the sound tree with the mips tree
From: Stephen Rothwell @ 2011-09-19 5:29 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Manuel Lauss, Ralf Baechle, Mark Brown
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/mips/Kconfig between commit 9d7dec27ace1 ("MIPS: Alchemy: remove
all CONFIG_SOC_AU1??? defines") from the mips tree and commit
7137c6bcb7ff ("ALSA: deprecate MIPS AU1X00 AC97 driver") from the sound
tree.
Just context changes. I fixed it up (see below) anc can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/mips/Kconfig
index 0a0d501,77dd0a1..0000000
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@@ -23,8 -23,8 +23,8 @@@ config SND_SGI_HAL
config SND_AU1X00
- tristate "Au1x00 AC97 Port Driver"
+ tristate "Au1x00 AC97 Port Driver (DEPRECATED)"
- depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
+ depends on MIPS_ALCHEMY
select SND_PCM
select SND_AC97_CODEC
help
^ permalink raw reply
* Re: linux-next: manual merge of the wireless tree with Linus' tree
From: Luciano Coelho @ 2011-09-19 5:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
In-Reply-To: <20110919151434.e710fc8eb95675a2c6a278cd@canb.auug.org.au>
Hi Stephen
On Mon, 2011-09-19 at 15:14 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
> add max_sched_scan_ssids value to the hw description") from Linus' tree
> and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
> sched_scan") from the wireless tree.
>
> I used the version from the wireless tree.
This is correct, the version from the wireless tree should be use (ie.,
setting the value to 8). I guess wireless-next doesn't include the
change that went into Linus' tree yet.
--
Cheers,
Luca.
^ permalink raw reply
* linux-next: manual merge of the wireless tree with Linus' tree
From: Stephen Rothwell @ 2011-09-19 5:14 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Luciano Coelho
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
add max_sched_scan_ssids value to the hw description") from Linus' tree
and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
sched_scan") from the wireless tree.
I used the version from the wireless tree.
--
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 net tree with Linus' tree
From: Stephen Rothwell @ 2011-09-19 4:51 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Yaniv Rosner, Eilon Greenstein,
Joe Perches
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
net tree.
The former removes the code cleaned up by the latter, so I used the
former (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index ba15bdc,8e9b87b..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -852,20 -852,26 +852,20 @@@ static int bnx2x_ets_e3b0_get_total_bw
/* Calculate total BW requested */
for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
-
- if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
- DP(NETIF_MSG_LINK,
- "bnx2x_ets_E3B0_config BW was set to 0\n");
- return -EINVAL;
+ *total_bw +=
+ ets_params->cos[cos_idx].params.bw_params.bw;
}
- *total_bw +=
- ets_params->cos[cos_idx].params.bw_params.bw;
- }
}
- /*Check taotl BW is valid */
+ /* Check total BW is valid */
if ((100 != *total_bw) || (0 == *total_bw)) {
if (0 == *total_bw) {
- DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW"
- "shouldn't be 0\n");
+ DP(NETIF_MSG_LINK,
+ "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
return -EINVAL;
}
- DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW should be"
- "100\n");
+ DP(NETIF_MSG_LINK,
+ "bnx2x_ets_E3B0_config toatl BW should be 100\n");
/**
* We can handle a case whre the BW isn't 100 this can happen
* if the TC are joined.
^ permalink raw reply
* linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell @ 2011-09-19 4:41 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Toshiharu Okada, Jeff Kirsher
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit 7756332f5b64 ("pch_gbe: support ML7831
IOH") from Linus' tree and the driver rearrangement patches from the net
tree.
The changes in the commit from Linus' tree don;t affect fucntionality, so
I just used the net tree version.
--
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: temporary github repository
From: Rafael J. Wysocki @ 2011-09-18 17:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton, Tejun Heo
In-Reply-To: <20110918233220.91733671ed4fd0ccbc7552f6@canb.auug.org.au>
On Sunday, September 18, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> On Sun, 18 Sep 2011 15:18:35 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > OK, so the temporary location of the linux-pm tree's linux-next branch is at:
> >
> > git://github.com/rjwysocki/linux-pm.git linux-next
>
> I will switch to this from Monday, thanks.
>
> Just checking that you intentionally dropped a merge of the pm-freezer
> branch?
I did, since the original branch is unavailable along with git.kernel.org.
Thanks,
Rafael
^ permalink raw reply
* Re: linux-next: build failure after merge of the mfd tree
From: Samuel Ortiz @ 2011-09-18 17:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, David Jander, Uwe Kleine-König
In-Reply-To: <20110916135523.01ec57f699192230272e99e3@canb.auug.org.au>
Hi Stephen,
On Fri, Sep 16, 2011 at 01:55:23PM +1000, Stephen Rothwell wrote:
> Hi Samuel,
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
> drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
>
This should be fixed now, thanks for the report.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply
* Re: linux-next: temporary github repository
From: Stephen Rothwell @ 2011-09-18 13:32 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <201109181518.35788.rjw@sisk.pl>
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
Hi Rafael,
On Sun, 18 Sep 2011 15:18:35 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> OK, so the temporary location of the linux-pm tree's linux-next branch is at:
>
> git://github.com/rjwysocki/linux-pm.git linux-next
I will switch to this from Monday, thanks.
Just checking that you intentionally dropped a merge of the pm-freezer
branch?
--
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: temporary github repository
From: Rafael J. Wysocki @ 2011-09-18 13:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20110918212535.a1038aa5f0caad9d83e351b2@canb.auug.org.au>
Hi,
On Sunday, September 18, 2011, Stephen Rothwell wrote:
> Hi all,
>
> Since kernel.org has not returned yet, I have created a temporary
> repository on github that will contain linux-next until the kernel.org
> servers return. You can access it at
> git://github.com/sfrothwell/linux-next.git
OK, so the temporary location of the linux-pm tree's linux-next branch is at:
git://github.com/rjwysocki/linux-pm.git linux-next
Thanks,
Rafael
^ permalink raw reply
* Re: git tree URL for IEEE 1394 (FireWire) kernel subsystem
From: Stephen Rothwell @ 2011-09-18 11:51 UTC (permalink / raw)
To: Stefan Richter; +Cc: linux-next, linux1394-devel, linux-kernel
In-Reply-To: <20110917194757.2f561324@stein>
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
Hi Stefan,
On Sat, 17 Sep 2011 19:47:57 +0200 Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:
>
> please switch the ieee1394/for-next pull URL to
>
> git://git.user.in-berlin.de/s5r6/linux1394.git for-next
>
> until kernel.org springs back into action. Thanks.
I will switch to this from Monday, thanks.
--
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: temporary github repository
From: Stephen Rothwell @ 2011-09-18 11:25 UTC (permalink / raw)
To: LKML; +Cc: linux-next, Linus, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
Hi all,
Since kernel.org has not returned yet, I have created a temporary
repository on github that will contain linux-next until the kernel.org
servers return. You can access it at
git://github.com/sfrothwell/linux-next.git
--
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
* git tree URL for IEEE 1394 (FireWire) kernel subsystem
From: Stefan Richter @ 2011-09-17 17:47 UTC (permalink / raw)
To: Stephen Rothwell, linux-next; +Cc: linux1394-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
Stephen,
please switch the ieee1394/for-next pull URL to
git://git.user.in-berlin.de/s5r6/linux1394.git for-next
until kernel.org springs back into action. Thanks.
Current contents relative to mainline:
Ming Lei (1):
firewire: ohci: add no MSI quirk for O2Micro controller
Stefan Richter (3):
firewire: sbp2: remove obsolete reference counting
firewire: sbp2: move some code to more sensible places
firewire: sbp2: fold two functions into one
Stephan Gatzka (2):
firewire: ohci: Move code from the bus reset tasklet into a workqueue
firewire: ohci: Add support for TSB41BA3D phy
drivers/firewire/ohci.c | 206 ++++++++++++++++++++++++++++++++++++--
drivers/firewire/sbp2.c | 256 +++++++++++++++++++++--------------------------
2 files changed, 308 insertions(+), 154 deletions(-)
--
Stefan Richter
-=====-==-== =--= =---=
http://arcgraph.de/sr/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the block tree
From: Stephen Rothwell @ 2011-09-17 11:18 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Sam Bradshaw
[-- Attachment #1: Type: text/plain, Size: 7471 bytes --]
Hi Jens,
After merging the block tree, today's linux-next build (i386 allmodconfig)
failed like this:
drivers/block/mtip32xx/mtip32xx.c:95: error: expected specifier-qualifier-list before 'compat_ulong_t'
drivers/block/mtip32xx/mtip32xx.c: In function 'exec_drive_taskfile':
drivers/block/mtip32xx/mtip32xx.c:1631: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1632: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1633: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1658: error: 'compat_long_t' undeclared (first use in this function)
drivers/block/mtip32xx/mtip32xx.c:1658: error: (Each undeclared identifier is reported only once
drivers/block/mtip32xx/mtip32xx.c:1658: error: for each function it appears in.)
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1663: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1668: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1708: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1729: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1871: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1872: warning: cast from pointer to integer of different size
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of '__pu_val'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1922: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1922: error: 'struct mtip_compat_ide_task_request_s' has no member named 'out_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of '__pu_val'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
drivers/block/mtip32xx/mtip32xx.c:1927: warning: type defaults to 'int' in declaration of 'type name'
drivers/block/mtip32xx/mtip32xx.c:1927: error: 'struct mtip_compat_ide_task_request_s' has no member named 'in_size'
Caused by commit 49fdf3a7c4cf ("block: Add driver for Micron RealSSD pcie
flash cards"). Sorry I didn't spot it earlier ...
This driver assumes CONFIG_COMPAT is set.
--
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: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2011-09-16 8:39 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Samuel Ortiz, linux-next, linux-kernel, David Jander
In-Reply-To: <20110916071638.GJ11297@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
Hi Uwe,
On Fri, 16 Sep 2011 09:16:38 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> > Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
> > to mc13xxx MFD").
> >
> > I have used the mfd tree from next-20110915 for today.
> I'd look into the issue, but I don't have 747c98a3660d and I don't know
> where to get it from. IMHO it would be great if you could push your next
> tree somewhere.
Well, you can get it from the mfd tree (branch for-next of
git://git.infradead.org/users/sameo/mfd-2.6.git).
--
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: build failure after merge of the mfd tree
From: Uwe Kleine-König @ 2011-09-16 7:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel, David Jander
In-Reply-To: <20110916135523.01ec57f699192230272e99e3@canb.auug.org.au>
Hello Stephen,
On Fri, Sep 16, 2011 at 01:55:23PM +1000, Stephen Rothwell wrote:
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
> drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:196:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:203:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:206:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:213:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:216:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:223:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:226:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:233:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:236:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:244:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:246:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:248:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:250:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:253:15: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:255:15: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c: In function 'mc13783_led_probe':
> drivers/leds/leds-mc13783.c:278:11: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:278:34: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:279:54: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:283:36: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:295:23: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:297:19: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:299:14: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:299:47: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:300:50: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:305:31: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:307:13: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:312:27: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:313:31: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:314:42: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:317:24: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c:329:43: error: dereferencing pointer to incomplete type
> drivers/leds/leds-mc13783.c: In function 'mc13783_led_remove':
> drivers/leds/leds-mc13783.c:359:23: error: dereferencing pointer to incomplete type
>
> Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
> to mc13xxx MFD").
>
> I have used the mfd tree from next-20110915 for today.
I'd look into the issue, but I don't have 747c98a3660d and I don't know
where to get it from. IMHO it would be great if you could push your next
tree somewhere.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* linux-next: Tree for Sept 16
From: Stephen Rothwell @ 2011-09-16 6:36 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 22898 bytes --]
Hi all,
With master.kernel.org down, some trees have moved to temporary locations
(so some updates are coming through). However, the actual release of the
linux-next trees will be delayed until master returns. I will still do
the overnight builds, though.
The powerpc allyesconfig build still fails today.
Changes since 20110915:
The mfd tree gained a build failure so I used the version from
next-20110915.
The security tree lost its build failure.
The xen tree lost its build failure.
The akpm tree gained a conflict against Linus' tree and I removed a few
patches that have been included elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 200 trees (counting Linus' and 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (content): Merge conflict in arch/arm/include/asm/hardware/cache-l2x0.h
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (delete/modify): arch/arm/mach-exynos4/mach-smdkc210.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos4/mach-smdkc210.c left in tree.
$ git rm -f arch/arm/mach-exynos4/mach-smdkc210.c
Applying: s5p: merge fixup for atags_offset use
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800usb.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/rtc/rtc-twl.c
$ git reset --hard HEAD^
Merging refs/next/20110915/mfd
CONFLICT (content): Merge conflict in drivers/rtc/rtc-twl.c
[master 71d9912] Merge commit 'refs/next/20110915/mfd'
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in drivers/s390/char/vmur.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: When no floppy is found the module code can be released while a timer
Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Since the commit below which added O_PATH support to the *at() calls, the
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: kbuf is a buffer that is local to this function, so all of the error paths
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: Unbreak the alpha build.
Applying: Unbreak alpha build.
Applying: Unbreak alpha build.
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: > You might get some speed benefit by optimising for the small copies
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
CONFLICT (content): Merge conflict in include/linux/swap.h
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
Applying: When we get a bad_page bug report, it's useful to see what modules the
Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
Applying: Some kernel components pin user space memory (infiniband and perf) (by
Applying: Add comments to explain the page statistics field in the mm_struct.
Applying: add missing ;
Applying: Testing from the XFS folk revealed that there is still too much I/O from
Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
Applying: Direct reclaim should never writeback pages. For now, handle the
Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
Applying: It is preferable that no dirty pages are dispatched for cleaning from the
Applying: Workloads that are allocating frequently and writing files place a large
Applying: When direct reclaim encounters a dirty page, it gets recycled around the
Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
Applying: printk_ratelimit() should not be used, because it shares ratelimiting
Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
Applying: Use newly introduced memchr_inv() for page verification.
Applying: A shrinker function can return -1, means that it cannot do anything
Applying: Use atomic-long operations instead of looping around cmpxchg().
Applying: massage atomic.h inclusions
Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
Applying: SPARC32 require access to the start address. Add a new helper
Applying: With the NO_BOOTMEM symbol added architectures may now use the following
Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
Applying: This adds THP support to mremap (decreases the number of split_huge_page()
Applying: coding-style nitpicking
Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
Applying: reduce ifdeffery
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: Make the security_inode_init_security() initxattrs arg const, to match the
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: include linux/module.h
Applying: The memory for struct led_trigger should be kfreed in the
Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
CONFLICT (content): Merge conflict in mm/memcontrol.c
Applying: Before calling schedule_timeout(), task state should be changed.
Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
Applying: If somebody is touching data too early, it might be easier to diagnose a
Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
Applying: Force this on for -next/mm testing purposes.
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: After merging the akpm tree, today's linux-next build (lost of them)
Applying: The discovered bit in PGCCSR register indicates if the device has been
Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
Applying: When I tried to send a patch to remove it, Andi told me we still need to
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Applying: Simply creates one point to call the w1 interface.
Applying: Adds a nolock function to the w1 interface to avoid locking the
Applying: Fixes the deadlock when inserting and removing the ds2780.
Merging akpm
Applying: akpm: merge fix up fix for memcg
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the akpm tree
From: Stephen Rothwell @ 2011-09-16 6:21 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Andrew Morton
Hi Andrew,
After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:
mm/memcontrol.c: In function 'mem_cgroup_force_empty':
mm/memcontrol.c:3761:15: error: 'rec' undeclared (first use in this function)
mm/memcontrol.c:3761:15: note: each undeclared identifier is reported only once for each function it appears in
mm/memcontrol.c:3761:7: error: too many arguments to function 'try_to_free_mem_cgroup_pages'
include/linux/swap.h:254:22: note: declared here
Presumably caused by my bad merge fixup. I applied the further fix below.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 16 Sep 2011 16:17:52 +1000
Subject: [PATCH] akpm: merge fix up fix for memcg
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
mm/memcontrol.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a505fc9..1faea9b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3758,7 +3758,7 @@ try_to_free:
goto out;
}
progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL,
- false, &rec);
+ false);
if (!progress) {
nr_retries--;
/* maybe some writeback is necessary */
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* linux-next: manual merge of the akpm tree with Linus' tree
From: Stephen Rothwell @ 2011-09-16 6:09 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Andrew Morton, Raghavendra K T,
Johannes Weiner
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
mm/memcontrol.c between commit 185efc0f9a1f ("memcg: Revert "memcg: add
memory.vmscan_stat"") from Linus' tree and commit 970f23b7f013 ("The
memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses")
from the akpm 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 mm/memcontrol.c
index 1364b5e,e47a504..0000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -202,9 -202,53 +202,9 @@@ struct mem_cgroup_eventfd_list
struct eventfd_ctx *eventfd;
};
- static void mem_cgroup_threshold(struct mem_cgroup *mem);
- static void mem_cgroup_oom_notify(struct mem_cgroup *mem);
+ static void mem_cgroup_threshold(struct mem_cgroup *memcg);
+ static void mem_cgroup_oom_notify(struct mem_cgroup *memcg);
-enum {
- SCAN_BY_LIMIT,
- SCAN_BY_SYSTEM,
- NR_SCAN_CONTEXT,
- SCAN_BY_SHRINK, /* not recorded now */
-};
-
-enum {
- SCAN,
- SCAN_ANON,
- SCAN_FILE,
- ROTATE,
- ROTATE_ANON,
- ROTATE_FILE,
- FREED,
- FREED_ANON,
- FREED_FILE,
- ELAPSED,
- NR_SCANSTATS,
-};
-
-struct scanstat {
- spinlock_t lock;
- unsigned long stats[NR_SCAN_CONTEXT][NR_SCANSTATS];
- unsigned long rootstats[NR_SCAN_CONTEXT][NR_SCANSTATS];
-};
-
-const char *scanstat_string[NR_SCANSTATS] = {
- "scanned_pages",
- "scanned_anon_pages",
- "scanned_file_pages",
- "rotated_pages",
- "rotated_anon_pages",
- "rotated_file_pages",
- "freed_pages",
- "freed_anon_pages",
- "freed_file_pages",
- "elapsed_ns",
-};
-#define SCANSTAT_WORD_LIMIT "_by_limit"
-#define SCANSTAT_WORD_SYSTEM "_by_system"
-#define SCANSTAT_WORD_HIERARCHY "_under_hierarchy"
-
-
/*
* The memory controller data structure. The memory controller controls both
* page cache and RSS per cgroup. We would eventually like to provide
@@@ -1659,18 -1745,28 +1662,18 @@@ static int mem_cgroup_hierarchical_recl
bool noswap = reclaim_options & MEM_CGROUP_RECLAIM_NOSWAP;
bool shrink = reclaim_options & MEM_CGROUP_RECLAIM_SHRINK;
bool check_soft = reclaim_options & MEM_CGROUP_RECLAIM_SOFT;
- struct memcg_scanrecord rec;
unsigned long excess;
- unsigned long scanned;
+ unsigned long nr_scanned;
- excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT;
+ excess = res_counter_soft_limit_excess(&root_memcg->res) >> PAGE_SHIFT;
/* If memsw_is_minimum==1, swap-out is of-no-use. */
- if (!check_soft && !shrink && root_mem->memsw_is_minimum)
+ if (!check_soft && !shrink && root_memcg->memsw_is_minimum)
noswap = true;
- if (shrink)
- rec.context = SCAN_BY_SHRINK;
- else if (check_soft)
- rec.context = SCAN_BY_SYSTEM;
- else
- rec.context = SCAN_BY_LIMIT;
-
- rec.root = root_memcg;
-
while (1) {
- victim = mem_cgroup_select_victim(root_mem);
- if (victim == root_mem) {
+ victim = mem_cgroup_select_victim(root_memcg);
+ if (victim == root_memcg) {
loop++;
/*
* We are not draining per cpu cached charges during
@@@ -3753,15 -3858,19 +3756,15 @@@ try_to_free
lru_add_drain_all();
/* try to free all pages in this cgroup */
shrink = 1;
- while (nr_retries && mem->res.usage > 0) {
+ while (nr_retries && memcg->res.usage > 0) {
- struct memcg_scanrecord rec;
int progress;
if (signal_pending(current)) {
ret = -EINTR;
goto out;
}
- progress = try_to_free_mem_cgroup_pages(mem, GFP_KERNEL,
- false);
- rec.context = SCAN_BY_SHRINK;
- rec.mem = memcg;
- rec.root = memcg;
+ progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL,
+ false, &rec);
if (!progress) {
nr_retries--;
/* maybe some writeback is necessary */
@@@ -4926,21 -5091,22 +4929,21 @@@ mem_cgroup_create(struct cgroup_subsys
*/
mem_cgroup_get(parent);
} else {
- res_counter_init(&mem->res, NULL);
- res_counter_init(&mem->memsw, NULL);
+ res_counter_init(&memcg->res, NULL);
+ res_counter_init(&memcg->memsw, NULL);
}
- mem->last_scanned_child = 0;
- mem->last_scanned_node = MAX_NUMNODES;
- INIT_LIST_HEAD(&mem->oom_notify);
+ memcg->last_scanned_child = 0;
+ memcg->last_scanned_node = MAX_NUMNODES;
+ INIT_LIST_HEAD(&memcg->oom_notify);
if (parent)
- mem->swappiness = mem_cgroup_swappiness(parent);
- atomic_set(&mem->refcnt, 1);
- mem->move_charge_at_immigrate = 0;
- mutex_init(&mem->thresholds_lock);
- return &mem->css;
+ memcg->swappiness = mem_cgroup_swappiness(parent);
+ atomic_set(&memcg->refcnt, 1);
+ memcg->move_charge_at_immigrate = 0;
+ mutex_init(&memcg->thresholds_lock);
- spin_lock_init(&memcg->scanstat.lock);
+ return &memcg->css;
free_out:
- __mem_cgroup_free(mem);
+ __mem_cgroup_free(memcg);
root_mem_cgroup = NULL;
return ERR_PTR(error);
}
^ permalink raw reply
* linux-next: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2011-09-16 3:55 UTC (permalink / raw)
To: Samuel Ortiz
Cc: linux-next, linux-kernel, David Jander, Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 3335 bytes --]
Hi Samuel,
After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/leds/leds-mc13783.c: In function 'mc13783_leds_prepare':
drivers/leds/leds-mc13783.c:193:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:196:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:203:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:206:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:213:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:216:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:223:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:226:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:233:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:236:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:244:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:246:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:248:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:250:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:253:15: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:255:15: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c: In function 'mc13783_led_probe':
drivers/leds/leds-mc13783.c:278:11: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:278:34: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:279:54: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:283:36: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:295:23: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:297:19: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:299:14: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:299:47: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:300:50: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:305:31: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:307:13: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:312:27: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:313:31: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:314:42: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:317:24: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c:329:43: error: dereferencing pointer to incomplete type
drivers/leds/leds-mc13783.c: In function 'mc13783_led_remove':
drivers/leds/leds-mc13783.c:359:23: error: dereferencing pointer to incomplete type
Presumably caused by commit 747c98a3660d ("leds: Convert mc13783 driver
to mc13xxx MFD").
I have used the mfd tree from next-20110915 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: Temporary location for some of the SCSI trees
From: Stephen Rothwell @ 2011-09-16 0:57 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-scsi, linux-next, linux-kernel
In-Reply-To: <1316101053.2983.42.camel@dabdike.hansenpartnership.com>
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
Hi James,
On Thu, 15 Sep 2011 10:37:33 -0500 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> I've relocated the scsi-rc-fixes and scsi-misc trees on to my own
> infrastructure while master.kernel.org is down. The locations are:
>
> git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git
> git://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git
OK, I will swicth to these trees 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: linux-next: build failure after merge of the final tree (security tree related)
From: James Morris @ 2011-09-16 0:51 UTC (permalink / raw)
To: Mimi Zohar; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <1316124231.3345.29.camel@localhost.localdomain>
On Thu, 15 Sep 2011, Mimi Zohar wrote:
> Thanks Stephen. James, assuming that the patch needs to be made
> available from the security tree, it's available from:
>
> The following changes since commit 8de6ac7f58a22fdab399fbe97763e465ea49c735:
>
> Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next (2011-09-15 09:53:38 +1000)
>
> are available in the git repository at:
>
> git://github.com/mzohar/linux-evm.git next-for-james
>
> Stephen Rothwell (1):
> encrypted-keys: IS_ERR need include/err.h
>
> security/keys/encrypted-keys/masterkey_trusted.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
Pulled, thanks.
--
James Morris
<jmorris@namei.org>
^ 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