headers
Stephen Rothwell | 9 Feb 06:04
Picon
Picon

linux-next: Tree for Feb 9

Hi all,

Changes since 20120208:

The arm tree lost its conflicts.

The arm-perf tree lost its conflict.

The gpio tree still has its build failure for which I reverted a commit.

The kmap_atomic tree gained a conflict against the staging.current tree.

The irqdomain tree gained a conflict against the arm tree.

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

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/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
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 9 Feb 05:14
Picon
Picon

linux-next: manual merge of the irqdomain tree with the arm tree

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
arch/arm/common/gic.c between commit c11907f588d6 ("ARM: 7318/1: gic:
refactor irq_start assignment") from the arm tree and commit 7da5a66bbf1f
("irq_domain: Remove 'new' irq_domain in favour of the ppc one") from the
irqdomain tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc arch/arm/common/gic.c
index ca6b5dd,8cf934c..0000000
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@@ -348,12 -344,15 +345,11 @@@ void __init gic_cascade_irq(unsigned in

  static void __init gic_dist_init(struct gic_chip_data *gic)
  {
- 	unsigned int i, irq;
+ 	unsigned int i;
  	u32 cpumask;
  	unsigned int gic_irqs = gic->gic_irqs;
- 	struct irq_domain *domain = &gic->domain;
  	void __iomem *base = gic_data_dist_base(gic);
 -	u32 cpu = 0;
 -
 -#ifdef CONFIG_SMP
(Continue reading)

Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 9 Feb 04:48
Picon
Picon

linux-next: manual merge of the kmap_atomic tree with the staging.current tree

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
("staging: zcache: fix serialization bug in zv stats") from the
staging.current tree and commit a3a2486aeadb ("zcache: remove the second
argument of k [un]map_atomic()") from the kmap_atomic tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc drivers/staging/zcache/zcache-main.c
index 875acd8,57550ae..0000000
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@@ -674,9 -675,9 +674,9 @@@ static struct zv_hdr *zv_create(struct 
  			&page, &offset, ZCACHE_GFP_MASK);
  	if (unlikely(ret))
  		goto out;
 -	zv_curr_dist_counts[chunks]++;
 -	zv_cumul_dist_counts[chunks]++;
 +	atomic_inc(&zv_curr_dist_counts[chunks]);
 +	atomic_inc(&zv_cumul_dist_counts[chunks]);
- 	zv = kmap_atomic(page, KM_USER0) + offset;
+ 	zv = kmap_atomic(page) + offset;
  	zv->index = index;
  	zv->oid = *oid;
(Continue reading)

Permalink | Reply | 3 comments |
headers
Stephen Rothwell | 8 Feb 06:16
Picon
Picon

linux-next: Tree for Feb 8

Hi all,

Changes since 20120207:

The l2-mtd tree lost its build failure.

The gpio tree still has its build failure for which I reverted a commit.

The kmap_atomic tree gained a conflict against the net-next tree.

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

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/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.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 7 Feb 03:58
Picon
Picon

linux-next: build failure after merge of the l2-mtd tree

Hi Artem,

After merging the l2-mtd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/devices/pmc551.c: In function 'pmc551_erase':
drivers/mtd/devices/pmc551.c:157:2: error: implicit declaration of function 'pmc551_point' [-Werror=implicit-function-declaration]
drivers/mtd/devices/pmc551.c: At top level:
drivers/mtd/devices/pmc551.c:194:12: error: static declaration of 'pmc551_point' follows
non-static declaration
drivers/mtd/devices/pmc551.c:157:2: note: previous implicit declaration of 'pmc551_point' was here
drivers/mtd/devices/pmc551.c: In function 'pmc551_unpoint':
drivers/mtd/devices/pmc551.c:229:1: warning: no return statement in function returning non-void [-Wreturn-type]

Caused by commit 1e43e2c68ec0 ("mtd: remove junk pmc551.h").  The last
warning was already there.  Please try to build test this stuff before
publishing ...

I have used the version of the l2-mtd tree from next-20120203 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 6 Feb 05:52
Picon
Picon

linux-next: Tree for Feb 6

Hi all,

Changes since 20120203:

The l2-mtd tree gained a build failure so I used the version from
next-20120203.

The sound-asoc tree gained a build failure so I used the version from
next-20120203.

The pm tree lost its conflict.

The mmc tree gained a build failure for which I reverted a commit.

The regulator tree lost its build failure.

The gpio tree lost its build failure but gained another got which I
reverted a commit.

The akpm tree lost some patches that turned up 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/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).
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 6 Feb 05:39
Picon
Picon

linux-next: build failure after merge of the final tree (mmc tree related)

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/mmc/host/sdhci-of-esdhc.c:143:2: error: unknown field 'platform_suspend' specified in initializer
drivers/mmc/host/sdhci-of-esdhc.c:143:2: warning: initialization from incompatible pointer type
[enabled by default]
drivers/mmc/host/sdhci-of-esdhc.c:143:2: warning: (near initialization for
'sdhci_esdhc_ops.get_timeout_clock') [enabled by default]
drivers/mmc/host/sdhci-of-esdhc.c:144:2: error: unknown field 'platform_resume' specified in initializer
drivers/mmc/host/sdhci-of-esdhc.c:144:2: warning: initialization from incompatible pointer type
[enabled by default]
drivers/mmc/host/sdhci-of-esdhc.c:144:2: warning: (near initialization for
'sdhci_esdhc_ops.platform_8bit_width') [enabled by default]

Caused by commit 4f6eeb41eee9 ("mmc: esdhc: Implement power management
for ESDHC").  I can't see how that was ever even build tested ..

I have reverted that commit for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 6 Feb 05:23
Picon
Picon

linux-next: build failure after merge of the final tree (gpio tree related)

Hi Grant,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpio/gpio-sodaville.c:130:2: error: unknown field 'dt_translate' specified in initializer
drivers/gpio/gpio-sodaville.c:130:2: warning: initialization from incompatible pointer type
[enabled by default]
drivers/gpio/gpio-sodaville.c:130:2: warning: (near initialization for
'irq_domain_sdv_ops.match') [enabled by default]
drivers/gpio/gpio-sodaville.c: In function 'sdv_register_irqsupport':
drivers/gpio/gpio-sodaville.c:152:8: error: 'struct irq_domain' has no member named 'irq_base'
drivers/gpio/gpio-sodaville.c:182:2: error: implicit declaration of function 'irq_domain_add' [-Werror=implicit-function-declaration]
drivers/gpio/gpio-sodaville.c: In function 'sdv_gpio_remove':
drivers/gpio/gpio-sodaville.c:263:2: error: implicit declaration of function 'irq_domain_del' [-Werror=implicit-function-declaration]

Caused by commit 8b26c833d229 ("gpio: Add a driver for Sodaville GPIO
controller") interacting with the irqdomain tree changes.

I have reverted that commit for today.  I am not sure how you should
handle this ... you could send me a fixup patch that I should apply as a
merge fix when merging the irqdomain tree.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 6 Feb 02:25
Picon
Picon

linux-next: build failure after merge of the sound-asoc tree

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/codecs/max9768.c: In function 'max9768_probe':
sound/soc/codecs/max9768.c:138:3: error: implicit declaration of function 'snd_soc_add_controls' [-Werror=implicit-function-declaration]

Caused by commit 022658beab55 ("ASoC: core: Add support for DAI and
machine kcontrols").

I have used the sound-asoc tree from next-20120203 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 3 comments |
headers
Stephen Rothwell | 6 Feb 02:07
Picon
Picon

linux-next: build failure after merge of the l2-mtd tree

Hi Artem,

After merging the l2-mtd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/devices/pmc551.c:191:12: error: conflicting types for 'pmc551_unpoint'
include/linux/mtd/pmc551.h:37:13: note: previous declaration of 'pmc551_unpoint' was here
drivers/mtd/devices/pmc551.c: In function 'pmc551_unpoint':
drivers/mtd/devices/pmc551.c:196:1: warning: no return statement in function returning non-void [-Wreturn-type]

Caused by commit 753c57f84b57 ("mtd: return error code from
mtd_unpoint").  [Mind you, I don't understand why those static functions
would be declared in a header file ...]

I have used the l2-mtd tree from next-20120203 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 3 Feb 06:24
Picon
Picon

linux-next: Tree for Feb 3

Hi all,

Changes since 20120202:

New tree: irqdomain

The sound-asoc tree gained a conflict.

The regulator tree gained a build failure for which I reverted a commit.

The gpio tree gained a conflict against the regulator tree and a build
failure so I used the version from next-20120202.

The uprobes tree lost its merge fix.

The driver-core tree lost its conflict but gained another against the
driver-core.current tree.

The akpm tree lost a patch that turned up 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/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).
(Continue reading)

Permalink | Reply | 0 comments |

Gmane