* Re: linux-next: build failure after merge of the md tree
From: NeilBrown @ 2012-04-11 4:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jim Kukunas, H. Peter Anvin
In-Reply-To: <20120411134259.61f755a90055b23a6876687b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]
On Wed, 11 Apr 2012 13:42:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> lib/raid6/recov.c: In function 'raid6_has_ssse3':
> lib/raid6/recov.c:27:2: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration]
> lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first use in this function)
> lib/raid6/recov.c:27:22: note: each undeclared identifier is reported only once for each function it appears in
> lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2' undeclared (first use in this function)
> lib/raid6/recov.c:29:16: error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
> lib/raid6/recov.c: At top level:
> lib/raid6/recov.c:25:12: warning: 'raid6_has_ssse3' defined but not used [-Wunused-function]
>
> Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized recovery
> functions"). All the world is not X86 :-)
>
> I have used the md tree from next-20120410 for today.
Thanks Stephen,
I've removed that set of patches from my for-next pending further review and
revision.
Thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (devicetree tree related)
From: Stephen Rothwell @ 2012-04-11 5:11 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Thomas Abraham
[-- Attachment #1: Type: text/plain, Size: 556 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
drivers/of/of_mdio.c: In function 'of_mdiobus_register':
drivers/of/of_mdio.c:75:4: error: implicit declaration of function 'irq_of_parse_and_map' [-Werror=implicit-function-declaration]
Caused by commit e46c11b94787 ("of/irq: add empty irq_of_parse_and_map()
for non-dt builds"). SPARC has CONFIG_OF but not CONFIG_OF_IRQ ...
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Apr 11
From: Stephen Rothwell @ 2012-04-11 5:21 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 26589 bytes --]
Hi all,
Changes since 20120410:
The tile tree lost its conflicts.
The v4l-dvb tree gained a build failure so I used the version from
next-20120410.
The wireless-next tree gained a conflict against the net-next tree.
The md tree gained a build failure so I used the version from
next-20120410.
The regulator tree lost its build failure.
The devicetree tree gained a build failure for which I reverted a commit.
The regmap tree gained a build failure so I used the version from
next-20120410.
The tty tree lost its build failure.
The pinctrl tree lost its build failure.
----------------------------------------------------------------------------
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.
Below is a summary of the state of the merge.
We are up to 188 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. And to Paul
Gortmaker for triage and bug fixes.
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 (a9e1e53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
Merging arm-current/fixes (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart)
Merging sparc/master (d657784 sparc32,leon: fix leon build)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (18a223e tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample)
Merging sound-current/for-linus (fae3d88 ALSA: hda - hide HDMI/ELD printks unless snd.debug=2)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (011afa1 Revert "ath9k: fix going to full-sleep on PS idle")
Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures)
Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
Merging usb.current/usb-linus (a65a6f1 USB: serial: fix race between probe and open)
Merging staging.current/staging-linus (6490311 staging/xgifb: fix display on XGI Volari Z11m cards)
Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (fb16395 Input: trackpoint - use psmouse_fmt() for messages)
Merging md-current/for-linus (5020ad7 md/raid1,raid10: don't compare excess byte during consistency check.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (1acf771 irq_domain: Fix debug output to use "irq" instead of "virq")
Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (cc4d22a spi/imx: mark base member in spi_imx_data as __iomem)
Merging gpio-current/gpio/merge (6270d83 gpio: Fix range check in of_gpio_simple_xlate())
Merging arm/for-next (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (cfae12a Merge branch 'next/iommu-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (4d5914d cris/mm/fault.c: Port OOM changes to do_page_fault)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (25d0b90 scsi/atari: Make more functions static)
Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate())
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (b7918da [S390] update default configuration)
Merging sh/sh-latest (bbb4ce5 serial: sh-sci: modify sci_break_ctl())
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (0638f53 arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
Merging gfs2/master (02ed02f GFS2: Allow caching of rindex glock)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
Merging nfsd/nfsd-next (797a9d7 nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (dd775ae Linux 3.4-rc1)
Merging xfs/for-next (0034102 Linux 3.4-rc2)
Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (e0367870 hwmon: use module_pci_driver)
Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
$ git reset --hard HEAD^
Merging refs/next/20120410/v4l-dvb
Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (dd775ae Linux 3.4-rc1)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (06eb4ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-next/master (78f9c85 b43: claim support for IBSS RSN)
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Merging bluetooth/master (30720c9 Bluetooth: Adds set_default function in L2CAP setup)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (8592db4 Merge branch 'topic/hda' into for-next)
Merging sound-asoc/for-next (07b6335 Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (d568778 Input: wacom_i2c - do not use irq_to_gpio)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (cbe128e cgroup: get rid of populate for memcg)
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (aaed8df mmc: sdhci: Log what timeout was set if the timeout is too large)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (b58fc3e md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.)
$ git reset --hard HEAD^
Merging refs/next/20120410/md
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (cf0ff3d Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem)
Merging selinux/master (ecf093d SELinux: add default_type statements)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (b3aa158 workqueue: Fix workqueue_execute_end() comment)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (6810d77 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (911bcb2 Merge branch 'linus')
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (36e88a5 Merge branch 'regmap-stride' into regmap-next)
$ git reset --hard HEAD^
Merging refs/next/20120410/regmap
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (ecf1948 w1: fix slave driver registration error message)
Merging tty/tty-next (59d59b0 ISDN: remove uses of isdn_tty_revision)
Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data)
Merging staging/staging-next (b330f60 staging: replace open-coded ARRAY_SIZEs)
Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (a57be23 pinctrl: tegra: Add complete device tree support)
Merging tegra/for-next (2ac6b1e Merge branch 'for-3.5/debug' into for-next)
Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code)
Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next)
Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h)
Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: block: use lockdep_assert_held() for queue locking
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-fix-2
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds-add-led-driver-for-lm3556-chip-fix
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (5175be8 notify_change(): check that i_mutex is held)
[master 57942ad] Revert "of/irq: add empty irq_of_parse_and_map() for non-dt builds"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH] regmap: fix compile errors in regmap-irq.c due to stride changes
From: Stephen Warren @ 2012-04-11 5:37 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, linux-next, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
Commit f01ee60fffa4 ("regmap: implement register striding") caused the
compile errors below. Fix them.
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_sync_unlock':
drivers/base/regmap/regmap-irq.c:62:12: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c:62:12: note: each undeclared identifier is reported only once for each function it appears in
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_enable':
drivers/base/regmap/regmap-irq.c:77:37: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_disable':
drivers/base/regmap/regmap-irq.c:85:37: error: 'map' undeclared (first use in this function)
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
I apologize for the lame patches. I didn't notice that regmap-irq.c had a
separate config option that wasn't enabled.
drivers/base/regmap/regmap-irq.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 56b8136..fc69d29 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -50,6 +50,7 @@ static void regmap_irq_lock(struct irq_data *data)
static void regmap_irq_sync_unlock(struct irq_data *data)
{
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
+ struct regmap *map = d->map;
int i, ret;
/*
@@ -59,7 +60,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
*/
for (i = 0; i < d->chip->num_regs; i++) {
ret = regmap_update_bits(d->map, d->chip->mask_base +
- (i * map->map->reg_stride),
+ (i * map->reg_stride),
d->mask_buf_def[i], d->mask_buf[i]);
if (ret != 0)
dev_err(d->map->dev, "Failed to sync masks in %x\n",
@@ -72,6 +73,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
static void regmap_irq_enable(struct irq_data *data)
{
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
+ struct regmap *map = d->map;
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~irq_data->mask;
@@ -80,6 +82,7 @@ static void regmap_irq_enable(struct irq_data *data)
static void regmap_irq_disable(struct irq_data *data)
{
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
+ struct regmap *map = d->map;
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->irq);
d->mask_buf[irq_data->reg_offset / map->reg_stride] |= irq_data->mask;
--
1.7.0.4
^ permalink raw reply related
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Srinivas KANDAGATLA @ 2012-04-11 7:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, stable
In-Reply-To: <20120411121058.088008039d669521e9afdfeb@canb.auug.org.au>
I see no reason why __kfifo_max_r should not be exported to modules.
All the __kfifo_* functions in kfifo.h are already exported except this one.
Am happy to generate a patch.
On 11/04/12 03:10, Stephen Rothwell wrote:
> Hi Mauro,
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "__kfifo_max_r" [drivers/media/rc/rc-core.ko] undefined!
>
> Caused by commit 24a19bcbceda ("[media] ir-raw: Check available elements
> in kfifo before adding"). kfifo_avail expands to a call to __kfifo_max_r
> which is not exported to modules.
>
> I have used the v4l-dvb tree from next-20120410 for today.
^ permalink raw reply
* Re: linux-next: build failure after merge of the regmap tree
From: Mark Brown @ 2012-04-11 8:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Stephen Warren
In-Reply-To: <20120411141346.3c4dd8e481d052b583ac95b6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
On Wed, Apr 11, 2012 at 02:13:46PM +1000, Stephen Rothwell wrote:
> Caused by commit f01ee60fffa4 ("regmap: implement register striding").
> Please build test ...
Mainline *still* doesn't build with the .configs I routinely use.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] regmap: fix compile errors in regmap-irq.c due to stride changes
From: Mark Brown @ 2012-04-11 8:24 UTC (permalink / raw)
To: Stephen Warren; +Cc: linux-kernel, linux-next, Stephen Warren
In-Reply-To: <1334122642-14864-1-git-send-email-swarren@wwwdotorg.org>
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
On Tue, Apr 10, 2012 at 11:37:22PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Commit f01ee60fffa4 ("regmap: implement register striding") caused the
> compile errors below. Fix them.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] pinctrl: fix build when CONFIG_OF && !CONFIG_PINCTRL
From: Linus Walleij @ 2012-04-11 8:29 UTC (permalink / raw)
To: Stephen Warren; +Cc: sfr, linux-kernel, linux-next, Stephen Warren
In-Reply-To: <1333511636-9987-1-git-send-email-swarren@wwwdotorg.org>
On Wed, Apr 4, 2012 at 5:53 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> pinctrl/devicetree.c won't compile when !CONFIG_PINCTRL, since the
> pinctrl headers don't declare some types when !PINCTRL. Make sure
> pinctrl/Makefile only attempts to compile devicetree.c when OF &&
> PINCTRL.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
OK applied this instead of the Kconfig way of fixing things...
Thanks,
Linus Walleij
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (devicetree tree related)
From: David Miller @ 2012-04-11 13:35 UTC (permalink / raw)
To: sfr; +Cc: grant.likely, linux-next, linux-kernel, thomas.abraham
In-Reply-To: <20120411151155.b1a614f174442a592d1c1561@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Apr 2012 15:11:55 +1000
> Hi all,
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> drivers/of/of_mdio.c: In function 'of_mdiobus_register':
> drivers/of/of_mdio.c:75:4: error: implicit declaration of function 'irq_of_parse_and_map' [-Werror=implicit-function-declaration]
>
> Caused by commit e46c11b94787 ("of/irq: add empty irq_of_parse_and_map()
> for non-dt builds"). SPARC has CONFIG_OF but not CONFIG_OF_IRQ ...
If I had a nickel for every time an implicit dependency on CONFIG_OF_IRQ
was added to the tree... :-)
^ permalink raw reply
* mainline build failure (Was: Re: linux-next: build failure after merge of the regmap tree)
From: Stephen Rothwell @ 2012-04-11 22:07 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Stephen Warren
In-Reply-To: <20120411081711.GB3163@opensource.wolfsonmicro.com>
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
On Wed, 11 Apr 2012 09:17:11 +0100 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> On Wed, Apr 11, 2012 at 02:13:46PM +1000, Stephen Rothwell wrote:
>
> > Caused by commit f01ee60fffa4 ("regmap: implement register striding").
> > Please build test ...
>
> Mainline *still* doesn't build with the .configs I routinely use.
So, what is this failure and what configs do you build? And has a fix
been submitted?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (devicetree tree related)
From: Stephen Rothwell @ 2012-04-12 0:31 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Thomas Abraham
In-Reply-To: <20120411151155.b1a614f174442a592d1c1561@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 758 bytes --]
Hi Grant,
On Wed, 11 Apr 2012 15:11:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> drivers/of/of_mdio.c: In function 'of_mdiobus_register':
> drivers/of/of_mdio.c:75:4: error: implicit declaration of function 'irq_of_parse_and_map' [-Werror=implicit-function-declaration]
>
> Caused by commit e46c11b94787 ("of/irq: add empty irq_of_parse_and_map()
> for non-dt builds"). SPARC has CONFIG_OF but not CONFIG_OF_IRQ ...
>
> I have reverted that commit for today.
That commit is actually in the devicetree-current tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (devicetree tree related)
From: Grant Likely @ 2012-04-12 0:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Thomas Abraham
In-Reply-To: <20120412103157.70669ff82b81d5d926c36d4d@canb.auug.org.au>
On Wed, Apr 11, 2012 at 6:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> On Wed, 11 Apr 2012 15:11:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the final tree, today's linux-next build (sparc64 defconfig)
>> failed like this:
>>
>> drivers/of/of_mdio.c: In function 'of_mdiobus_register':
>> drivers/of/of_mdio.c:75:4: error: implicit declaration of function 'irq_of_parse_and_map' [-Werror=implicit-function-declaration]
>>
>> Caused by commit e46c11b94787 ("of/irq: add empty irq_of_parse_and_map()
>> for non-dt builds"). SPARC has CONFIG_OF but not CONFIG_OF_IRQ ...
>>
>> I have reverted that commit for today.
>
> That commit is actually in the devicetree-current tree.
Yes, drop that tree or revert that commit. There's nothing else in
there and I didn't have time to pull it back today before you started
linux-next for the day. The change is bogus and I'll spin a proper
fixup for tomorrow.
g.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (devicetree tree related)
From: Stephen Rothwell @ 2012-04-12 0:44 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Thomas Abraham
In-Reply-To: <CACxGe6tDa+AzK0O=E+EPZ90Ek_C-rM-G4fHSnsdL0S+fNcmzmw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
Hi Grant,
On Wed, 11 Apr 2012 18:35:34 -0600 Grant Likely <grant.likely@secretlab.ca> wrote:
>
> Yes, drop that tree or revert that commit. There's nothing else in
> there and I didn't have time to pull it back today before you started
> linux-next for the day. The change is bogus and I'll spin a proper
> fixup for tomorrow.
Done (I used the tree from next-20120410 - which was empty).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the wireless-next tree
From: Stephen Rothwell @ 2012-04-12 2:24 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Thomas Pedersen, David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
Hi John,
After merging the wireless-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
net/wireless/nl80211.c: In function 'nl80211_ch_switch_notify':
net/wireless/nl80211.c:8060:2: error: implicit declaration of function 'NLA_PUT_U32' [-Werror=implicit-function-declaration]
Caused by commit 5314526b1743 ("cfg80211: add channel switch notify
event") interacting with commit 9360ffd18597 ("wireless: Stop using
NLA_PUT*()") from the net-next tree.
I added the following merge fix patch.
John, you may like to cherry-pick that commit from Dave's tree (or back
merge that part of Dave's tree or get Dave to merge you tree and start
further work on top of the merge).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Apr 2012 12:21:01 +1000
Subject: [PATCH] cfg80211: NLA_PUT_U32 api change merge fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/wireless/nl80211.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f727a1f..f7d2ebb 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -8057,9 +8057,12 @@ void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
return;
}
- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, type);
+ if (nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex))
+ goto nla_put_failure;
+ if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq))
+ goto nla_put_failure;
+ if (nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, type))
+ goto nla_put_failure;
genlmsg_end(msg, hdr);
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: manual merge of the arm-soc tree with the mmc tree
From: Stephen Rothwell @ 2012-04-12 4:02 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Chris Ball, Sascha Hauer, Nicolas Ferre
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mmc/host/Kconfig
index 9f1f5e2,4d15dff..0000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -295,18 -288,16 +288,6 @@@ config MMC_ATMELMC
If unsure, say N.
- endchoice
-
- config MMC_ATMELMCI_DMA
- bool "Atmel MCI DMA support"
- depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE
- help
- Say Y here to have the Atmel MCI driver use a DMA engine to
- do data transfers and thus increase the throughput and
- reduce the CPU utilization.
-
- If unsure, say N.
-
-config MMC_IMX
- tristate "Motorola i.MX Multimedia Card Interface support"
- depends on ARCH_MX1
- help
- This selects the Motorola i.MX Multimedia card Interface.
- If you have a i.MX platform with a Multimedia Card slot,
- say Y or M here.
-
- If unsure, say N.
-
config MMC_MSM
tristate "Qualcomm SDCC Controller Support"
depends on MMC && ARCH_MSM
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the mmc tree
From: Chris Ball @ 2012-04-12 4:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Sascha Hauer, Nicolas Ferre
In-Reply-To: <20120412140206.704731281bf2ee7d93d582bf@canb.auug.org.au>
Hi,
On Thu, Apr 12 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
> driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
> choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
> atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, Stephen.
Nicolas and Arnd, these MMC Kconfig patches weren't sent to me or
linux-mmc@ for review, so I haven't seen them before. They look
fine, but I'd like to be in the loop directly to avoid surprises.
Do these MMC patches have any dependency on other work? It doesn't
look like it. If that's so, I'd rather carry them in the MMC tree
to save Stephen and Linus from dealing with the merge conflict.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply
* linux-next: Tree for Apr 12
From: Stephen Rothwell @ 2012-04-12 4:59 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 26433 bytes --]
Hi all,
Changes since 20120411:
The devicetree-current tree still had its build failure so I used the
version from next-20120410.
The v4l-dvb tree still had its build failure so I used the version from
next-20120410.
The wireless-next tree gained a build failure for which I added a merge
fix patch.
The md tree lost its build failure.
The regmap tree lost its build failure.
The arm-soc tree gained a conflict against the mmc 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.
Below is a summary of the state of the merge.
We are up to 188 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. And to Paul
Gortmaker for triage and bug fixes.
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 (f549e08 Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
Merging arm-current/fixes (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart)
Merging sparc/master (d657784 sparc32,leon: fix leon build)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (a21d457 tcp: avoid order-1 allocations on wifi and tx path)
Merging sound-current/for-linus (fae3d88 ALSA: hda - hide HDMI/ELD printks unless snd.debug=2)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (b4838d1 NFC: Fix the LLCP Tx fragmentation loop)
Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures)
Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
Merging usb.current/usb-linus (a65a6f1 USB: serial: fix race between probe and open)
Merging staging.current/staging-linus (6490311 staging/xgifb: fix display on XGI Volari Z11m cards)
Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (55158c8 Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h)
Merging md-current/for-linus (5020ad7 md/raid1,raid10: don't compare excess byte during consistency check.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
$ git reset --hard HEAD^
Merging refs/next/20120410/devicetree-current
Merging spi-current/spi/merge (39ec0d3 spi/imx: prevent NULL pointer dereference in spi_imx_probe())
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (1ef2f17 Merge branch 'next/cleanup-samsung-iommu' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (4d5914d cris/mm/fault.c: Port OOM changes to do_page_fault)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (25d0b90 scsi/atari: Make more functions static)
Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (09f61ff powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (affbb42 [S390] Fix compile error in swab.h)
Merging sh/sh-latest (ee56510 MAINTAINERS: Update git URL for SH.)
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (0638f53 arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (0a2da9b fuse: allow nanosecond granularity)
Merging gfs2/master (02ed02f GFS2: Allow caching of rindex glock)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
Merging nfsd/nfsd-next (e3f70ea Lockd: pass network namespace to creation and destruction routines)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (0034102 Linux 3.4-rc2)
Merging xfs/for-next (0034102 Linux 3.4-rc2)
Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (09b4bf6 acpi_power_meter: clean up code around setup_attrs)
Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
$ git reset --hard HEAD^
Merging refs/next/20120410/v4l-dvb
Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (dd775ae Linux 3.4-rc1)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (0034102 Linux 3.4-rc2)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (cade455 team: add missed "statics")
Merging wireless-next/master (e66a8dd rt2x00: do not generate seqno in h/w if QOS is disabled)
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Applying: cfg80211: NLA_PUT_U32 api change merge fix
Merging bluetooth/master (30720c9 Bluetooth: Adds set_default function in L2CAP setup)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (924a70c Merge branch 'fix/hda' into for-next)
Merging sound-asoc/for-next (1258b6c Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (b5e9528 Input: ep93xx_keypad - switch to using dev_pm_ops)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (86f82d5 cgroup: remove cgroup_subsys->populate())
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (a334b95 mmc: remove imxmmc driver)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (7f4bd77 md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.)
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (cf0ff3d Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem)
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (b3aa158 workqueue: Fix workqueue_execute_end() comment)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (6810d77 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (911bcb2 Merge branch 'linus')
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (d3283fb trace: Remove unused workqueue tracer)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (b076764 Merge branch 'regmap-stride' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (8f1e125 w1: Disable irqs during 1-wire bus operations, extend 1-wire reset pulse)
Merging tty/tty-next (59d59b0 ISDN: remove uses of isdn_tty_revision)
Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data)
Merging staging/staging-next (b330f60 staging: replace open-coded ARRAY_SIZEs)
Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (f97b106 pinctrl: tegra: Add complete device tree support)
Merging tegra/for-next (8ab2cf3 Merge branch 'for-3.5/debug' into for-next)
Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code)
Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h)
Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: block: use lockdep_assert_held() for queue locking
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-fix-2
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds-add-led-driver-for-lm3556-chip-fix
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (d7d85de notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: mainline build failure (Was: Re: linux-next: build failure after merge of the regmap tree)
From: Mark Brown @ 2012-04-12 15:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Stephen Warren
In-Reply-To: <20120412080714.1b9fe574b18adebcc8af0ff1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 946 bytes --]
On Thu, Apr 12, 2012 at 08:07:14AM +1000, Stephen Rothwell wrote:
> So, what is this failure and what configs do you build? And has a fix
> been submitted?
It's a build failure in the trace subsystem when perf isn't enabled; I
submitted a patch as soon as I noticed the issue which was either during
the merge window or just after -rc1 came out and resubmitted it again
this week. In response to the reposting Steven Rostedt said he'd pick
the fix up but I'm not sure when that'll happen or how long it'll take
to propagate to mainline, this appears to be one of those areas where
things get processed in batch mode.
I mainly build an ARM config that I can run usefully on my development
boards which is mostly built in and a modular x86 config since x86 seems
to have lots of issues with modular stuff. I should be able to adjust
the ARM config to build, I didn't yet mostly because I wasn't expecting
the issue to be ignored for so long.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 12
From: Andrew Morton @ 2012-04-12 21:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, netdev
In-Reply-To: <20120412145931.9ec6f2b51655071795d60d1d@canb.auug.org.au>
On Thu, 12 Apr 2012 14:59:31 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
This isn't working for me. Some time between April 3 and April 12
someone merged something into the non-mm part of linux-next which broke
ssh.
I boot the box and everything seems to come up OK, but attemtps to ssh
into the machine fail with
X11 forwarding request failed on channel 0
Last login: Thu Apr 12 13:04:35 2012 from akpm.corp.google.com
Connection to akpm2 closed.
I took a peek in the `strace ssh' output.
Good:
17815 write(5, "Last login: Thu Apr 12 13:27:23 "..., 65) = 65
17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 770798})
17815 read(3, "\21O\200\366Mv\343\222\332\251\2403L\376Y18\2047\336\244\226p-+X\2%\2119\314\255"..., 8192) = 80
17815 select(7, [3 4], [5], NULL, {120, 0}) = 1 (out [5], left {119, 999987})
17815 write(5, "\r\33[m\17\33[27m\33[24m\33[Jakpm2:/home/ak"..., 39) = 39
17815 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [4], left {118, 801111})
17815 read(4, "\4", 16384) = 1
17815 select(7, [3 4], [3], NULL, {120, 0}) = 1 (out [3], left {119, 999991})
17815 write(3, "\235J\5\340\234\21\266\207\26e\362\327\2\332\1\267\272\200\364\267?/\320L\341\35\350{+M:\222"..., 48) = 48
Bad:
9305 write(5, "Last login: Thu Apr 12 13:02:54 "..., 65) = 65
9305 select(7, [3 4], [], NULL, {120, 0}) = 1 (in [3], left {119, 945541})
9305 read(3, "f\357\250~\260i\2259\320\3258\262)O\364;_\251\360-\314\31\374]\326\300\356\364\370S\3105"..., 8192) = 128
9305 close(5) = 0
9305 close(4) = 0
That read() is returning a lot more data.
It appears that we've done something which breaks X forwarding. I
won't be able to look any further into this until Monday.
^ permalink raw reply
* linux-next: "amba: Remove AMBA level regulator support" commit.
From: Paul Gortmaker @ 2012-04-13 1:22 UTC (permalink / raw)
To: broonie; +Cc: linus.walleij, linux-next, shawn.guo, rmk+kernel,
linux-arm-kernel
Hi Mark,
The commit in linux-next:
-----------------
commit b2bc9e0ee349db84035d8141e85babc7986594d7
Author: Mark Brown <broonie@sirena.org.uk>
Date: Mon Apr 2 12:30:35 2012 +0100
ARM: 7366/1: amba: Remove AMBA level regulator support
-----------------
is pointed at by git bisect for the u8500_defconfig build failure:
drivers/dma/ste_dma40.c:2708:3: error: implicit declaration of function
'regulator_disable' [-Werror=implicit-function-declaration]
drivers/dma/ste_dma40.c:2747:3: error: implicit declaration of function
'regulator_enable' [-Werror=implicit-function-declaration]
drivers/dma/ste_dma40.c:3260:3: error: implicit declaration of function
'regulator_get' [-Werror=implicit-function-declaration]
drivers/dma/ste_dma40.c:3271:4: error: implicit declaration of function
'regulator_put' [-Werror=implicit-function-declaration]
http://kisskb.ellerman.id.au/kisskb/buildresult/6095691/
If, like my earlier mail this week, this is something you've already
fixed, then please provide me a link, and I'll gladly include that in
the triage report, so you don't get needless extra mails about it.
Thanks,
Paul.
--
git bisect start
# good: [0034102808e0dbbf3a2394b82b1bb40b5778de9e] Linux 3.4-rc2
git bisect good 0034102808e0dbbf3a2394b82b1bb40b5778de9e
# bad: [87487c4514a94892ce478dc012da6d12a98ae360] Add linux-next specific files for 20120412
git bisect bad 87487c4514a94892ce478dc012da6d12a98ae360
# bad: [45701d47f211d6ce72ee2c1725904d2e173eb29f] Merge remote-tracking branch 'sound/for-next'
git bisect bad 45701d47f211d6ce72ee2c1725904d2e173eb29f
# good: [5d2acf8cc7515129a5d3aed7b0e0be18dbcf524f] Merge branch 'topic/misc' into for-next
git bisect good 5d2acf8cc7515129a5d3aed7b0e0be18dbcf524f
# bad: [846c4b315b6faae8f5ede661d80c222d669adbda] Merge remote-tracking branch 'target-merge/for-next-merge'
git bisect bad 846c4b315b6faae8f5ede661d80c222d669adbda
# bad: [9235a323f99492120565935040b6be61e687d0c6] Merge remote-tracking branch 'gfs2/master'
git bisect bad 9235a323f99492120565935040b6be61e687d0c6
# bad: [6c944bb0c84fa1a03af503e926d7bd3a4a7e7376] Merge remote-tracking branch 'usb.current/usb-linus'
git bisect bad 6c944bb0c84fa1a03af503e926d7bd3a4a7e7376
# bad: [ef75674b6700ad96cac1e1c377cf9809cea6a369] Merge remote-tracking branch 'net/master'
git bisect bad ef75674b6700ad96cac1e1c377cf9809cea6a369
# good: [39f86a608a3e0f0164bd1540acf87696cfdfb5bb] Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
git bisect good 39f86a608a3e0f0164bd1540acf87696cfdfb5bb
# good: [a1ada086062101533eb0f841d3884137688091ec] Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
git bisect good a1ada086062101533eb0f841d3884137688091ec
# good: [87151b8689d890dfb495081f7be9b9e257f7a2df] net: allow pskb_expand_head() to get maximum tailroom
git bisect good 87151b8689d890dfb495081f7be9b9e257f7a2df
# good: [f549e088b806f44b6ab6eeef0cb71ced1d2488dd] Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
git bisect good f549e088b806f44b6ab6eeef0cb71ced1d2488dd
# bad: [b2bc9e0ee349db84035d8141e85babc7986594d7] ARM: 7366/1: amba: Remove AMBA level regulator support
git bisect bad b2bc9e0ee349db84035d8141e85babc7986594d7
# good: [34af657916332e89564566bc8d35e3e06cc0c236] ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
git bisect good 34af657916332e89564566bc8d35e3e06cc0c236
^ permalink raw reply
* linux-next: triage for April 12, 2012
From: Paul Gortmaker @ 2012-04-13 1:45 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
This is kind of a "two days in one" report. Remember that this
report lags sfr's treegen by ~24h so that kisskb builds can run.
The i386 allmodconfig lost its rc5t583-regulator license typo fail
but picked up two more new fails (one still via rc5t583-regulator).
----------------------
New breakage since last report:
i386:allmodconfig
("rc5t583_ext_power_req_config" undefined)
("__udivdi3" [ethernet/mellanox/mlx4/mlx4_en.ko] undefined)
ARM:u8500_defconfig
(implicit declaration of function 'regulator_disable')
powerpc:mpc85xx_defconfig
(spi-fsl-lib.c:68 dereferencing pointer to incomplete type)
Randconfig fails that may or may not be new (by their very nature):
powerpc: iommu.c: implicit decl of function 'pci_dev_to_eeh_dev'
( http://kisskb.ellerman.id.au/kisskb/buildresult/6095808/ )
Builds that are fixed since last report:
ARM:eseries_pxa_defconfig,em_x270_defconfig,imx_v4_v5_defconfig
(sound/soc/codecs/wm9712.c: error: 'runtime' undeclared)
ARM/MIPS:magician_defconfig,omap1_defconfig,ip27_defconfig,s3c2410_defconfig
(regmap.c: too few arg to 'regmap_debugfs_init')
s390/sparc:allmodconfig,allyesconfig
(wiznet Kconfig fallout)
i386:allmodconfig
(GPL-incompatible module rc5t583-regulator.ko uses GPL-only symbol)
Note: The randconfig fails are only listed once and not tracked
in the below listing.
I'm also not tracking the kallsyms extra pass stuff on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of April 12th, 2012:
===============================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:u8500_defconfig
when: Apr 11
why: ste_dma40.c: implicit declaration of function 'regulator_disable'
status: reported
fix:
ref: http://marc.info/?l=linux-next&m=133428028418892&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091624/
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
---------------
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
frv:defconfig
when: Mar 15
why: undefined reference to `pci_cardbus_resource_alignment'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
----------------
i386:allmodconfig
when: Apr 11
why: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
why: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091475/
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Shawn Guo @ 2012-04-13 2:01 UTC (permalink / raw)
To: Paul Gortmaker
Cc: broonie, linus.walleij, linux-next, rmk+kernel, linux-arm-kernel
In-Reply-To: <20120413012230.GA30438@windriver.com>
On 13 April 2012 09:22, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> Hi Mark,
>
> The commit in linux-next:
>
> -----------------
> commit b2bc9e0ee349db84035d8141e85babc7986594d7
> Author: Mark Brown <broonie@sirena.org.uk>
> Date: Mon Apr 2 12:30:35 2012 +0100
>
> ARM: 7366/1: amba: Remove AMBA level regulator support
> -----------------
>
> is pointed at by git bisect for the u8500_defconfig build failure:
>
> drivers/dma/ste_dma40.c:2708:3: error: implicit declaration of function
> 'regulator_disable' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:2747:3: error: implicit declaration of function
> 'regulator_enable' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:3260:3: error: implicit declaration of function
> 'regulator_get' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:3271:4: error: implicit declaration of function
> 'regulator_put' [-Werror=implicit-function-declaration]
>
That's because Mark's patch removes "#include
<linux/regulator/consumer.h>" included indirectly by
drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should
really directly includes consumer.h.
Regards,
Shawn
^ permalink raw reply
* Re: linux-next: triage for April 12, 2012
From: Paul Gortmaker @ 2012-04-13 2:02 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20120413014505.GC30438@windriver.com>
On Thu, Apr 12, 2012 at 9:45 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> This is kind of a "two days in one" report. Remember that this
> report lags sfr's treegen by ~24h so that kisskb builds can run.
>
> The i386 allmodconfig lost its rc5t583-regulator license typo fail
> but picked up two more new fails (one still via rc5t583-regulator).
I forgot to mention that the m86k builds lost their android/persistent_ram.c
issue, but got fetched up on wiznet (reported by Geert and fix already
applied by DaveM) -- https://lkml.org/lkml/2012/4/12/369
P.
>
> ----------------------
>
> New breakage since last report:
> i386:allmodconfig
> ("rc5t583_ext_power_req_config" undefined)
> ("__udivdi3" [ethernet/mellanox/mlx4/mlx4_en.ko] undefined)
> ARM:u8500_defconfig
> (implicit declaration of function 'regulator_disable')
> powerpc:mpc85xx_defconfig
> (spi-fsl-lib.c:68 dereferencing pointer to incomplete type)
>
> Randconfig fails that may or may not be new (by their very nature):
> powerpc: iommu.c: implicit decl of function 'pci_dev_to_eeh_dev'
> ( http://kisskb.ellerman.id.au/kisskb/buildresult/6095808/ )
>
> Builds that are fixed since last report:
> ARM:eseries_pxa_defconfig,em_x270_defconfig,imx_v4_v5_defconfig
> (sound/soc/codecs/wm9712.c: error: 'runtime' undeclared)
> ARM/MIPS:magician_defconfig,omap1_defconfig,ip27_defconfig,s3c2410_defconfig
> (regmap.c: too few arg to 'regmap_debugfs_init')
> s390/sparc:allmodconfig,allyesconfig
> (wiznet Kconfig fallout)
> i386:allmodconfig
> (GPL-incompatible module rc5t583-regulator.ko uses GPL-only symbol)
>
> Note: The randconfig fails are only listed once and not tracked
> in the below listing.
>
> I'm also not tracking the kallsyms extra pass stuff on ARM on
> a per board basis anymore. It has nothing to do with the board.
> Why? See: http://marc.info/?l=linux-next&m=133267456809502
>
> ------------------------------------------------
>
> Latest results at:
> http://kisskb.ellerman.id.au/kisskb/branch/9/
>
> Failures as of April 12th, 2012:
> ===============================
>
> AM33:asb2303_defconfig,asb2364_defconfig
> when: Mar 15
> why: cc1: error: unrecognized command line option '-mmem-funcs'
> status: Possible fix from TonyB sent for review.
> fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
> ----------------
>
> ARM:u8500_defconfig
> when: Apr 11
> why: ste_dma40.c: implicit declaration of function 'regulator_disable'
> status: reported
> fix:
> ref: http://marc.info/?l=linux-next&m=133428028418892&w=2
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091624/
>
> ARM:netx_defconfig,pnx4008_defconfig
> when: Mar 14
> why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
> ref: https://lkml.org/lkml/2012/3/13/670
>
> ARM:ixp4xx_defconfig
> when: Oct 26
> why: gpio.h: implicit declaration of function '__gpio_get_value'
> status: fixed (Imre Kaloz) - but possibly needs rework?
> fix: https://lkml.org/lkml/2012/2/8/288
> ref: https://lkml.org/lkml/2012/2/8/287
>
> ARM:raumfeld_defconfig
> when: Nov 23
> why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
> status: perhaps broken since 2010? See ref below.
> fix:
> ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
>
> ARM:arm-allnoconfig
> when: forever
> why: not supported
> status: nothing pending, but patches accepted
> fix: n/a
> ref: https://lkml.org/lkml/2009/4/30/105
> ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
> ----------------
>
> AVR32:allnoconfig
> when: May 26 2010, 20:49
> why: at32_map_usart: undefined reference to `atmel_default_console_device'
> status:
> fix:
> ref:
> ---------------
>
> bfin: 50% of builds
> when: Mar 31
> why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
> status: unknown, binutils issue?
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
> ---------------
>
> cris:allyesconfig,allmodconfig
> when: Apr 3
> why: too many to list here
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
> ----------------
>
> frv:defconfig
> when: Mar 15
> why: undefined reference to `pci_cardbus_resource_alignment'
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
> ----------------
>
> i386:allmodconfig
> when: Apr 11
> why: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
> why: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091475/
> ----------------
>
> h8300:defconfig
> when: Mar 15
> why: time.c: implicit declaration of function 'get_irq_regs'
> why: also seems gcc suffers an ICE
> status: ICE bug lodged with gcc folks (TonyB)
> fix:
> ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
> ----------------
>
> m32r:m32700ut.smp_defconfig
> when: Mar 15
> why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
> ----------------
>
> m68k:allmodconfig
> when: Mar 16
> why: persistent_ram.c: implicit declaration of 'memblock_reserve'
> status:
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
> ref: http://www.spinics.net/lists/linux-next/msg19343.html
> ----------------
>
> mips:allmodconfig
> when:
> why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
> status: one of many fixes mips needs...
> fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
> ref: http://patchwork.ozlabs.org/patch/148614/
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
> ----------------
>
> parisc:allmodconfig
> when:
> why: include/linux/log2.h: implicit declaration of function 'fls'
> status: reported by PaulG, WIP by David Howells
> fix:
> ref: https://lkml.org/lkml/2012/2/29/409
> ref: https://lkml.org/lkml/2012/3/6/228
>
> parisc64:a500_defconfig
> when:
> why: include/linux/log2.h: implicit declaration of function 'fls'
> status: reported by PaulG, WIP by David Howells
> fix:
> ref: https://lkml.org/lkml/2012/2/29/409
> ref: https://lkml.org/lkml/2012/3/6/228
> ------------------
>
> powerpc:allyesconfig
> when: May 18 2009, 22:11
> why: fat ass kernel with everything simply won't link
> status: need to fix build config to ignore the final link
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
> ------------------
>
> um:um-defconfig
> when: Sep 16 2010, 01:28
> why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
> status: clearly broken forever, so does anyone care?
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: boot failures with next-20120411
From: Michael Neuling @ 2012-04-13 2:30 UTC (permalink / raw)
To: Stephen Rothwell, Jiri Slaby, Greg Kroah-Hartman
Cc: LKML, ppc-dev, linux-next
In-Reply-To: <20120411165835.415e546374a54ea94669b0c6@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Some (not all) of my PowerPC boot tests have failed like this after
> getting into user mode (this one was just after udev started, but others
> are after other processes getting going):
>
> Unable to handle kernel paging request for data at address 0xc0000003f9d550
> Faulting instruction address: 0xc0000000001b7f40
> Oops: Kernel access of bad area, sig: 11 [#1]
> SMP NR_CPUS=32 NUMA pSeries
> Modules linked in: ehea
> NIP: c0000000001b7f40 LR: c0000000001b7f14 CTR: c0000000000e04f0
> REGS: c0000003f68bf6b0 TRAP: 0300 Not tainted (3.4.0-rc2-autokern1)
> MSR: 800000000280b032 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI> CR: 24422424 XER: 20000001
> SOFTE: 1
> CFAR: 000000000000562c
> DAR: 00c0000003f9d550, DSISR: 40000000
> TASK = c0000003f8818000[3192] 'kdump' THREAD: c0000003f68bc000 CPU: 5
> GPR00: 0000000000000000 c0000003f68bf930 c000000000ce1d40 c0000003fe00ec00
> GPR04: 00000000000002d0 0000000000000038 c0000003f8f935e8 c000000000e55280
> GPR08: 0000000000000011 c000000000bcb280 c000000000bcb1e8 000000000028a000
> GPR12: 0000000024422424 c00000000f33bc80 00000fffdd90a770 0000000000081000
> GPR16: c0000003f846c000 000000000de4f7a0 f00000000de4f7a0 0000000000000000
> GPR20: c0000003f8365408 c0000003f8365480 c0000003f8e5d110 0000000000000000
> GPR24: 0000000000000100 c0000003f8365400 c0000000001e5424 00000000000002d0
> GPR28: 0000000000000800 00c0000003f9d550 c000000000c5b718 c0000003fe00ec00
> NIP [c0000000001b7f40] .__kmalloc+0x70/0x230
> LR [c0000000001b7f14] .__kmalloc+0x44/0x230
> Call Trace:
> [c0000003f68bf930] [c0000003f68bf9b0] 0xc0000003f68bf9b0 (unreliable)
> [c0000003f68bf9e0] [c0000000001e5424] .alloc_fdmem+0x24/0x70
> [c0000003f68bfa60] [c0000000001e54f8] .alloc_fdtable+0x88/0x130
> [c0000003f68bfaf0] [c0000000001e5924] .dup_fd+0x384/0x450
> [c0000003f68bfbd0] [c00000000009a310] .copy_process+0x880/0x11d0
> [c0000003f68bfcd0] [c00000000009aee0] .do_fork+0x70/0x400
> [c0000003f68bfdc0] [c0000000000141c4] .sys_clone+0x54/0x70
> [c0000003f68bfe30] [c000000000009aa0] .ppc_clone+0x8/0xc
> Instruction dump:
> 4bff9281 2ba30010 7c7f1b78 40dd00f4 e96d0040 e93f0000 7ce95a14 e9070008
> 7fa9582a 2fbd0000 41de0054 e81f0022 <7f3d002a> 38000000 886d01f2 980d01f2
> ---[ end trace 366fe6c7ced3bfb0 ]---
>
> This did not happen yesterday. Just wondering if anyone can think of
> anything obvious. Full console log at
> http://ozlabs.org/~sfr/next-20120411.log.bz2
I managed to bisect this down using pseries_defconfig with next-20120412
to this patch:
commit 85bbc003b24335e253a392f6a9874103b77abb36
Author: Jiri Slaby <jslaby@suse.cz>
Date: Mon Apr 2 13:54:22 2012 +0200
TTY: HVC, use tty from tty_port
The driver already used refcounting. So we just switch it to tty_port
helpers. And switch to tty_port->lock for tty.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reverting this commit (and 0146b6939074ebe14ece3604fd00e7be128a3812
otherwise git barfs) fixes the problem on next-20120412.
I'm assuming we got the ref count changes wrong somewhere in the patch
but the tty code is beyond me. Jiri, can you take a look?
Mikey
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-13 2:30 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Johannes Berg, David Miller, netdev,
Meenakshi Venkataraman
[-- Attachment #1: Type: text/plain, Size: 2183 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commits
11483b5c2296 ("iwlwifi: move eeprom into priv") and a42506eb27aa
("iwlwifi: move ucode_type from shared to op_mode") from the
wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index a54e20e,c8e89ca..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -540,12 -539,11 +543,12 @@@ static int iwl_testmode_driver(struct i
IWL_ERR(priv, "Memory allocation fail\n");
return -ENOMEM;
}
- NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
- IWL_TM_CMD_DEV2APP_EEPROM_RSP);
- NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
- cfg(priv)->base_params->eeprom_size,
- priv->eeprom);
+ if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+ IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+ nla_put(skb, IWL_TM_ATTR_EEPROM,
+ cfg(priv)->base_params->eeprom_size,
- priv->shrd->eeprom))
++ priv->eeprom))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n",
@@@ -609,10 -605,9 +612,10 @@@
inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
}
- if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type) ||
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
++ if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->ucode_type) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n", status);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ 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