Hi all,
Changes since 20110623:
My fixes tree includes:
(as an experiment) the early part of mmotm-2011-06-22-13-05
STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
The powerpc allyesconfig (and probably others) is still broken because of
a commit in the net tree.
The nfs tree lost its conflict.
The net tree still has its 2 build failures.
The wireless tree still has its build failure.
The tmem tree lost its conflicts.
----------------------------------------------------------------------------
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 194 trees (counting Linus' and 28 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 [email protected]
$ 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 fbdev-current/fbdev-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/pgalloc.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/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
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
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/ceph/export.c
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
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
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
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
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
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
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 slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in include/linux/netlink.h
Applying: Bluetooth: include scatterlist.h where needed
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
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
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
$ git rm -f arch/s390/kvm/sie64a.S
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
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 driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110623:
>
> My fixes tree includes:
> (as an experiment) the early part of mmotm-2011-06-22-13-05
> STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
drivers/mtd/ofpart.o: In function `init_module':
ofpart.c:(.init.text+0x0): multiple definition of `init_module'
drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
Full kernel .config file is attached.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
From: Randy Dunlap <[email protected]>
Fix lots more build errors in staging/iio when CONFIG_IIO_RING_BUFFER
is not enabled by moving enums and defines outside of the
CONFIG_IIO_RING_BUFFER ifdef block.
Examples (one from each driver; there were 116 total errors):
drivers/staging/iio/accel/adis16204_core.c:437: error: 'ADIS16204_SCAN_SUPPLY' undeclared here (not in a function)
drivers/staging/iio/accel/adis16209_core.c:410: error: 'ADIS16209_SCAN_SUPPLY' undeclared here (not in a function)
drivers/staging/iio/gyro/adis16260_core.c:420: error: 'ADIS16260_SCAN_GYRO' undeclared here (not in a function)
drivers/staging/iio/imu/adis16400_core.c:565: error: 'ADIS16400_SCAN_SUPPLY' undeclared here (not in a function)
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Cc: [email protected]
---
drivers/staging/iio/accel/adis16204.h | 2 +-
drivers/staging/iio/accel/adis16209.h | 4 ++--
drivers/staging/iio/gyro/adis16260.h | 2 +-
drivers/staging/iio/imu/adis16400.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--- linux-next-20110624.orig/drivers/staging/iio/accel/adis16204.h
+++ linux-next-20110624/drivers/staging/iio/accel/adis16204.h
@@ -84,7 +84,6 @@ struct adis16204_state {
int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
enum adis16204_scan {
ADIS16204_SCAN_SUPPLY,
ADIS16204_SCAN_ACC_X,
@@ -93,6 +92,7 @@ enum adis16204_scan {
ADIS16204_SCAN_TEMP,
};
+#ifdef CONFIG_IIO_RING_BUFFER
void adis16204_remove_trigger(struct iio_dev *indio_dev);
int adis16204_probe_trigger(struct iio_dev *indio_dev);
--- linux-next-20110624.orig/drivers/staging/iio/accel/adis16209.h
+++ linux-next-20110624/drivers/staging/iio/accel/adis16209.h
@@ -121,8 +121,6 @@ struct adis16209_state {
int adis16209_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
-
#define ADIS16209_SCAN_SUPPLY 0
#define ADIS16209_SCAN_ACC_X 1
#define ADIS16209_SCAN_ACC_Y 2
@@ -132,6 +130,8 @@ int adis16209_set_irq(struct iio_dev *in
#define ADIS16209_SCAN_INCLI_Y 6
#define ADIS16209_SCAN_ROT 7
+#ifdef CONFIG_IIO_RING_BUFFER
+
void adis16209_remove_trigger(struct iio_dev *indio_dev);
int adis16209_probe_trigger(struct iio_dev *indio_dev);
--- linux-next-20110624.orig/drivers/staging/iio/gyro/adis16260.h
+++ linux-next-20110624/drivers/staging/iio/gyro/adis16260.h
@@ -104,7 +104,6 @@ struct adis16260_state {
int adis16260_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
/* At the moment triggers are only used for ring buffer
* filling. This may change!
*/
@@ -115,6 +114,7 @@ int adis16260_set_irq(struct iio_dev *in
#define ADIS16260_SCAN_TEMP 3
#define ADIS16260_SCAN_ANGL 4
+#ifdef CONFIG_IIO_RING_BUFFER
void adis16260_remove_trigger(struct iio_dev *indio_dev);
int adis16260_probe_trigger(struct iio_dev *indio_dev);
--- linux-next-20110624.orig/drivers/staging/iio/imu/adis16400.h
+++ linux-next-20110624/drivers/staging/iio/imu/adis16400.h
@@ -158,7 +158,6 @@ struct adis16400_state {
int adis16400_set_irq(struct iio_dev *indio_dev, bool enable);
-#ifdef CONFIG_IIO_RING_BUFFER
/* At the moment triggers are only used for ring buffer
* filling. This may change!
*/
@@ -182,6 +181,7 @@ int adis16400_set_irq(struct iio_dev *in
#define ADIS16300_SCAN_INCLI_X 12
#define ADIS16300_SCAN_INCLI_Y 13
+#ifdef CONFIG_IIO_RING_BUFFER
void adis16400_remove_trigger(struct iio_dev *indio_dev);
int adis16400_probe_trigger(struct iio_dev *indio_dev);
On Fri, 2011-06-24 at 09:04 -0700, Randy Dunlap wrote:
> On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20110623:
> >
> > My fixes tree includes:
> > (as an experiment) the early part of mmotm-2011-06-22-13-05
> > STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
>
>
> When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
>
> drivers/mtd/ofpart.o: In function `init_module':
> ofpart.c:(.init.text+0x0): multiple definition of `init_module'
> drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
I guess this is some old issue? I do not think ofpart can be compiled-in
if the mtd core is a module...
--
Best Regards,
Artem Bityutskiy (Битюцкий Артём)
On 06/24/11 13:26, Artem Bityutskiy wrote:
> On Fri, 2011-06-24 at 09:04 -0700, Randy Dunlap wrote:
>> On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20110623:
>>>
>>> My fixes tree includes:
>>> (as an experiment) the early part of mmotm-2011-06-22-13-05
>>> STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
>>
>>
>> When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
>>
>> drivers/mtd/ofpart.o: In function `init_module':
>> ofpart.c:(.init.text+0x0): multiple definition of `init_module'
>> drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
>
> I guess this is some old issue? I do not think ofpart can be compiled-in
> if the mtd core is a module...
[adding driver author, Vitaly]
No, it's a current issue.
config MTD_OF_PARTS
def_bool y
depends on OF
and (implicitly) depends on MTD. MTD=m, so boolean => y.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Fri, 2011-06-24 at 13:38 -0700, Randy Dunlap wrote:
> On 06/24/11 13:26, Artem Bityutskiy wrote:
> > On Fri, 2011-06-24 at 09:04 -0700, Randy Dunlap wrote:
> >> On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
> >>
> >>> Hi all,
> >>>
> >>> Changes since 20110623:
> >>>
> >>> My fixes tree includes:
> >>> (as an experiment) the early part of mmotm-2011-06-22-13-05
> >>> STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
> >>
> >>
> >> When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
> >>
> >> drivers/mtd/ofpart.o: In function `init_module':
> >> ofpart.c:(.init.text+0x0): multiple definition of `init_module'
> >> drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
> >
> > I guess this is some old issue? I do not think ofpart can be compiled-in
> > if the mtd core is a module...
>
> [adding driver author, Vitaly]
>
> No, it's a current issue.
I meant that the subject suggests this is about linux-next, but this
problem should be in upstream.
--
Best Regards,
Artem Bityutskiy (Битюцкий Артём)
On 06/24/11 17:28, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix lots more build errors in staging/iio when CONFIG_IIO_RING_BUFFER
> is not enabled by moving enums and defines outside of the
> CONFIG_IIO_RING_BUFFER ifdef block.
>
> Examples (one from each driver; there were 116 total errors):
>
> drivers/staging/iio/accel/adis16204_core.c:437: error: 'ADIS16204_SCAN_SUPPLY' undeclared here (not in a function)
> drivers/staging/iio/accel/adis16209_core.c:410: error: 'ADIS16209_SCAN_SUPPLY' undeclared here (not in a function)
> drivers/staging/iio/gyro/adis16260_core.c:420: error: 'ADIS16260_SCAN_GYRO' undeclared here (not in a function)
> drivers/staging/iio/imu/adis16400_core.c:565: error: 'ADIS16400_SCAN_SUPPLY' undeclared here (not in a function)
Thanks Randy! I should really have taken the time to test the rest of these after
your first patch.
There's one more hiding in there I think, the adis16240.
I'll fire off a patch for this one with you as reported-by.
>
> Signed-off-by: Randy Dunlap <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Cc: [email protected]
> ---
> drivers/staging/iio/accel/adis16204.h | 2 +-
> drivers/staging/iio/accel/adis16209.h | 4 ++--
> drivers/staging/iio/gyro/adis16260.h | 2 +-
> drivers/staging/iio/imu/adis16400.h | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> --- linux-next-20110624.orig/drivers/staging/iio/accel/adis16204.h
> +++ linux-next-20110624/drivers/staging/iio/accel/adis16204.h
> @@ -84,7 +84,6 @@ struct adis16204_state {
>
> int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);
>
> -#ifdef CONFIG_IIO_RING_BUFFER
> enum adis16204_scan {
> ADIS16204_SCAN_SUPPLY,
> ADIS16204_SCAN_ACC_X,
> @@ -93,6 +92,7 @@ enum adis16204_scan {
> ADIS16204_SCAN_TEMP,
> };
>
> +#ifdef CONFIG_IIO_RING_BUFFER
> void adis16204_remove_trigger(struct iio_dev *indio_dev);
> int adis16204_probe_trigger(struct iio_dev *indio_dev);
>
> --- linux-next-20110624.orig/drivers/staging/iio/accel/adis16209.h
> +++ linux-next-20110624/drivers/staging/iio/accel/adis16209.h
> @@ -121,8 +121,6 @@ struct adis16209_state {
>
> int adis16209_set_irq(struct iio_dev *indio_dev, bool enable);
>
> -#ifdef CONFIG_IIO_RING_BUFFER
> -
> #define ADIS16209_SCAN_SUPPLY 0
> #define ADIS16209_SCAN_ACC_X 1
> #define ADIS16209_SCAN_ACC_Y 2
> @@ -132,6 +130,8 @@ int adis16209_set_irq(struct iio_dev *in
> #define ADIS16209_SCAN_INCLI_Y 6
> #define ADIS16209_SCAN_ROT 7
>
> +#ifdef CONFIG_IIO_RING_BUFFER
> +
> void adis16209_remove_trigger(struct iio_dev *indio_dev);
> int adis16209_probe_trigger(struct iio_dev *indio_dev);
>
> --- linux-next-20110624.orig/drivers/staging/iio/gyro/adis16260.h
> +++ linux-next-20110624/drivers/staging/iio/gyro/adis16260.h
> @@ -104,7 +104,6 @@ struct adis16260_state {
>
> int adis16260_set_irq(struct iio_dev *indio_dev, bool enable);
>
> -#ifdef CONFIG_IIO_RING_BUFFER
> /* At the moment triggers are only used for ring buffer
> * filling. This may change!
> */
> @@ -115,6 +114,7 @@ int adis16260_set_irq(struct iio_dev *in
> #define ADIS16260_SCAN_TEMP 3
> #define ADIS16260_SCAN_ANGL 4
>
> +#ifdef CONFIG_IIO_RING_BUFFER
> void adis16260_remove_trigger(struct iio_dev *indio_dev);
> int adis16260_probe_trigger(struct iio_dev *indio_dev);
>
> --- linux-next-20110624.orig/drivers/staging/iio/imu/adis16400.h
> +++ linux-next-20110624/drivers/staging/iio/imu/adis16400.h
> @@ -158,7 +158,6 @@ struct adis16400_state {
>
> int adis16400_set_irq(struct iio_dev *indio_dev, bool enable);
>
> -#ifdef CONFIG_IIO_RING_BUFFER
> /* At the moment triggers are only used for ring buffer
> * filling. This may change!
> */
> @@ -182,6 +181,7 @@ int adis16400_set_irq(struct iio_dev *in
> #define ADIS16300_SCAN_INCLI_X 12
> #define ADIS16300_SCAN_INCLI_Y 13
>
> +#ifdef CONFIG_IIO_RING_BUFFER
> void adis16400_remove_trigger(struct iio_dev *indio_dev);
> int adis16400_probe_trigger(struct iio_dev *indio_dev);
>
On Sat, 25 Jun 2011 09:35:13 +0300 Artem Bityutskiy wrote:
> On Fri, 2011-06-24 at 13:38 -0700, Randy Dunlap wrote:
> > On 06/24/11 13:26, Artem Bityutskiy wrote:
> > > On Fri, 2011-06-24 at 09:04 -0700, Randy Dunlap wrote:
> > >> On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
> > >>
> > >>> Hi all,
> > >>>
> > >>> Changes since 20110623:
> > >>>
> > >>> My fixes tree includes:
> > >>> (as an experiment) the early part of mmotm-2011-06-22-13-05
> > >>> STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
> > >>
> > >>
> > >> When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
> > >>
> > >> drivers/mtd/ofpart.o: In function `init_module':
> > >> ofpart.c:(.init.text+0x0): multiple definition of `init_module'
> > >> drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
> > >
> > > I guess this is some old issue? I do not think ofpart can be compiled-in
> > > if the mtd core is a module...
> >
> > [adding driver author, Vitaly]
> >
> > No, it's a current issue.
>
> I meant that the subject suggests this is about linux-next, but this
> problem should be in upstream.
Sorry I misunderstood your comment.
3.0-rc4 does not have this build error when I use the .config file with it...
however, I think that 3.0-rc4 also does not build ofpart.ko as it should.
Looks to me like changes in drivers/mtd/{Kconfig && Makefile} caused this
build error.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Sat, Jun 25, 2011 at 4:20 PM, Randy Dunlap <[email protected]> wrote:
> On Sat, 25 Jun 2011 09:35:13 +0300 Artem Bityutskiy wrote:
>
>> On Fri, 2011-06-24 at 13:38 -0700, Randy Dunlap wrote:
>> > On 06/24/11 13:26, Artem Bityutskiy wrote:
>> > > On Fri, 2011-06-24 at 09:04 -0700, Randy Dunlap wrote:
>> > >> On Fri, 24 Jun 2011 15:58:22 +1000 Stephen Rothwell wrote:
>> > >>
>> > >>> Hi all,
>> > >>>
>> > >>> Changes since 20110623:
>> > >>>
>> > >>> My fixes tree includes:
>> > >>> ? ? ? ? (as an experiment) the early part of mmotm-2011-06-22-13-05
>> > >>> ? ? ? ? STAGING: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
>> > >>
>> > >>
>> > >> When CONFIG_MTD=m, CONFIG_MTD_OF_PARTS=y:
>> > >>
>> > >> drivers/mtd/ofpart.o: In function `init_module':
>> > >> ofpart.c:(.init.text+0x0): multiple definition of `init_module'
>> > >> drivers/mtd/mtdcore.o:(.init.text+0x43): first defined here
>> > >
>> > > I guess this is some old issue? I do not think ofpart can be compiled-in
>> > > if the mtd core is a module...
>> >
>> > [adding driver author, Vitaly]
>> >
>> > No, it's a current issue.
>>
>> I meant that the subject suggests this is about linux-next, but this
>> problem should be in upstream.
>
> Sorry I misunderstood your comment.
>
> 3.0-rc4 does not have this build error when I use the .config file with it...
> however, I think that 3.0-rc4 also does not build ofpart.ko as it should.
>
> Looks to me like changes in drivers/mtd/{Kconfig && Makefile} caused this
> build error.
The following commit in linux-next appears to be the culprit:
commit 1a6bc893044b961caae1c5a9c6c2065e608da427
Author: Dmitry Eremin-Solenikov <[email protected]>
Date: Sun May 29 21:32:33 2011 +0400
mtd: prepare to convert of_mtd_parse_partitions to partition parser
Prepare to convert of_mtd_parse_partitions() to usual partitions parser:
1) Register ofpart parser
2) Internally don't use passed device for error printing
3) Add device_node to mtd_part_parser_data struct
4) Move of_mtd_parse_partitions from __devinit to common text section
5) add ofpart to the default list of partition parsers
Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
Signed-off-by: Artem Bityutskiy <[email protected]>
It adds a module_init() call to ofpart.c which does not work the way
that ofpart.c is linked to mtdcore.o. Seems like that commit series
still needs work.
g.
On Sun, 2011-06-26 at 00:11 -0600, Grant Likely wrote:
> > 3.0-rc4 does not have this build error when I use the .config file with it...
> > however, I think that 3.0-rc4 also does not build ofpart.ko as it should.
> >
> > Looks to me like changes in drivers/mtd/{Kconfig && Makefile} caused this
> > build error.
>
> The following commit in linux-next appears to be the culprit:
>
> commit 1a6bc893044b961caae1c5a9c6c2065e608da427
> Author: Dmitry Eremin-Solenikov <[email protected]>
> Date: Sun May 29 21:32:33 2011 +0400
>
> mtd: prepare to convert of_mtd_parse_partitions to partition parser
>
> Prepare to convert of_mtd_parse_partitions() to usual partitions parser:
> 1) Register ofpart parser
> 2) Internally don't use passed device for error printing
> 3) Add device_node to mtd_part_parser_data struct
> 4) Move of_mtd_parse_partitions from __devinit to common text section
> 5) add ofpart to the default list of partition parsers
>
> Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
> Signed-off-by: Artem Bityutskiy <[email protected]>
>
> It adds a module_init() call to ofpart.c which does not work the way
> that ofpart.c is linked to mtdcore.o. Seems like that commit series
> still needs work.
OK, let's ask Dmitry to take a look at this.
--
Best Regards,
Artem Bityutskiy (Битюцкий Артём)
On 6/26/11, Artem Bityutskiy <[email protected]> wrote:
> On Sun, 2011-06-26 at 00:11 -0600, Grant Likely wrote:
>> > 3.0-rc4 does not have this build error when I use the .config file with
>> > it...
>> > however, I think that 3.0-rc4 also does not build ofpart.ko as it
>> > should.
>> >
>> > Looks to me like changes in drivers/mtd/{Kconfig && Makefile} caused
>> > this
>> > build error.
>>
>> The following commit in linux-next appears to be the culprit:
>>
>> commit 1a6bc893044b961caae1c5a9c6c2065e608da427
>> Author: Dmitry Eremin-Solenikov <[email protected]>
>> Date: Sun May 29 21:32:33 2011 +0400
>>
>> mtd: prepare to convert of_mtd_parse_partitions to partition parser
>>
>> Prepare to convert of_mtd_parse_partitions() to usual partitions
>> parser:
>> 1) Register ofpart parser
>> 2) Internally don't use passed device for error printing
>> 3) Add device_node to mtd_part_parser_data struct
>> 4) Move of_mtd_parse_partitions from __devinit to common text section
>> 5) add ofpart to the default list of partition parsers
>>
>> Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
>> Signed-off-by: Artem Bityutskiy <[email protected]>
>>
>> It adds a module_init() call to ofpart.c which does not work the way
>> that ofpart.c is linked to mtdcore.o. Seems like that commit series
>> still needs work.
>
> OK, let's ask Dmitry to take a look at this.
Yes, I've forgot about this... ofpart can be made a simple module now.
I'll send two patches in five minutes or so.
--
With best wishes
Dmitry