* Re: linux-next: Tree for May 23
From: Nicholas A. Bellinger @ 2012-05-23 8:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, target-devel, linux-scsi
In-Reply-To: <20120523170740.ae058d8d5468d471eb948c39@canb.auug.org.au>
On Wed, 2012-05-23 at 17:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20120522:
>
> New tree: signal
>
> With the merge window open, conflicts are moving from tree to tree.
>
...
>
> $ git checkout master
> $ git reset --hard stable
> Merging origin/master (fb09baf Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
<SNIP>
> Merging scsi/for-next (841f97b [SCSI] qla2xxx: don't free pool that wasn't allocated)
> Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs)
> Merging target-merge/for-next-merge (ef872d2 Merge branch 'qla-target-merge' into for-next-merge)
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/tcm_qla2xxx.c
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.h
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dbg.h
Just wanted to mention that qla-target-merge branch has been dropped
from target-merge/for-next-merge now that these patches have hit James'
scsi/for-next tree.
Thank you Stephen!
--nab
^ permalink raw reply
* linux-next: Tree for May 23
From: Stephen Rothwell @ 2012-05-23 7:07 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 46307 bytes --]
Hi all,
Changes since 20120522:
New tree: signal
With the merge window open, conflicts are moving from tree to tree.
The i386 defconfig build is still broken.
The nfs tree lost its conflict.
The rr tree gained a conflict against Linus' tree.
The mmc tree lost its conflict.
The mfd tree gained a conflict against Linus' tree and still has its build
failure so I used the version from next-20120511.
The security tree lost its conflicts.
The watchdog tree lost its conflict but gained a build failure for which
I applied a patch.
The trivial tree lost a conflict.
The edac tree lost its conflict.
The tip tree lost a conflict.
The usb tree lost its conflicts.
The staging tree lost its conflicts.
The char-misc tree lost its conflict.
The arm-soc tree lost lots of conflicts.
The signal tree gained a conflict against the tip tree.
The akpm tree lost several patches to the new signal 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 189 trees (counting Linus' and 26 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 (fb09baf Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (72c04af fbdev: sh_mobile_lcdc: Don't confuse line size with pitch)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (29af0eb sparc32: use the common implementation of alloc_thread_info_node())
Merging net/master (37c106d if: restore token ring ARP type to header)
Merging sound-current/for-linus (85e184e Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-saif.c
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap-irq.c
CONFLICT (content): Merge conflict in drivers/base/regmap/internal.h
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 (a0d0d16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next)
Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5)
Merging tty.current/tty-linus (d48b97b Linux 3.4-rc6)
Merging usb.current/usb-linus (36be505 Linux 3.4-rc7)
Merging staging.current/staging-linus (69964ea Linux 3.4-rc5)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (b0d634d md/raid10: fix transcription error in calc_sectors conversion.)
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 (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (ba2092c spi/topcliff: use correct __devexit_p annotation)
Merging gpio-current/gpio/merge (7fd0fcf gpio/pch: Fix build failure when selected as a module)
Merging arm/for-next (72c04af fbdev: sh_mobile_lcdc: Don't confuse line size with pitch)
Merging arm-perf/for-next/perf (b3426c5 ARM: perf: remove arm_perf_pmu_ids global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h)
Merging c6x/for-linux-next (8ff98b9 C6X: remove unused config items)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (4035c6d [IA64] Liberate the signal layer from IA64 assembler)
Merging m68k/for-next (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging m68knommu/for-next (7094ac0 m68k: add a defconfig for the M5475EVB ColdFire with MMU board)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (e9ade1e Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (07e85b2 [PARISC] fix TLB fault path on PA2.0 narrow systems)
Merging powerpc/next (2074b1d powerpc: Fix irq distribution)
Merging 4xx/next (dce4c92 powerpc/40x: Use {upper,lower}_32_bits for msi_phys)
Merging mpc5xxx/next (f8d5842 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 (a7475af s390/ap: Fix wrong or missing comments)
Merging sh/sh-latest (5f19f14 sh: intc: Kill off special reservation interface.)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (9c27eda arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (6bd9adb libceph: fix pg_temp updates)
CONFLICT (content): Merge conflict in net/ceph/osdmap.c
CONFLICT (content): Merge conflict in net/ceph/messenger.c
Merging cifs/for-next (0d0c223 cifs: fix oops while traversing open file list (try #4))
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 (0324876 ext2: trivial fix to comment for ext2_free_blocks)
Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (72c04af fbdev: sh_mobile_lcdc: Don't confuse line size with pitch)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (5b4498c Merge branch 'devel' into linux-next)
Merging nfsd/nfsd-next (8be4df8 nfsd4: move rq_flavor into svc_cred)
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 (62f38455 UBI: modify ubi_wl_flush function to clear work queue for a lnum)
Merging xfs/for-next (14c26c6 xfs: add trace points for log forces)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/usb/core/inode.c left in tree.
$ git rm -f drivers/usb/core/inode.c
Merging pci/next (5420e46 microblaze/PCI: fix "io_offset undeclared" error)
Merging hid/for-next (d53c833 Merge branch 'wacom' into for-next)
Merging quilt/i2c (f7c1584 i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING)
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 (9868a06 i2c: davinci: Free requested IRQ in remove)
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (4573acb hwmon: (it87) Make temp3 attribute conditional for IT8782F)
Merging v4l-dvb/master (20a2218 Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/media/easycap/easycap_main.c
Merging kbuild/for-next (82f4625 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
CONFLICT (content): Merge conflict in arch/sparc/boot/Makefile
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (2fff275 PATA host controller driver for ep93xx)
Merging infiniband/for-next (e979fb9 Merge branch 'mlx4' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_cmds.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging acpi/next (29bdc67 Merge branch 'pss-workaround' into next)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (26c72e2 firewire: sbp2: document the absence of alignment requirements)
Merging ubi/linux-next (d48b97b Linux 3.4-rc6)
Merging dlm/next (75af271e dlm: NULL dereference on failure in kmem_cache_create())
Merging scsi/for-next (841f97b [SCSI] qla2xxx: don't free pool that wasn't allocated)
Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs)
Merging target-merge/for-next-merge (ef872d2 Merge branch 'qla-target-merge' into for-next-merge)
CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/tcm_qla2xxx.c
CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.h
CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dbg.h
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6df8ea3 merge: devel rnc-devel fixes)
Merging slave-dma/next (1dd1ea8 dmaengine: at_hdmac: take maxburst from slave configuration)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging wireless-next/master (05f8f25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging bluetooth/master (4433c1e Bluetooth: Remove dead int returns)
Merging mtd/master (85cd83f JFFS2: Add parameter to reserve disk space for root)
Merging l2-mtd/master (d9c04f2 mtd: tests: use random32 instead of home-brewed generator)
CONFLICT (content): Merge conflict in drivers/mtd/nand/plat_nand.c
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/ixdp425-setup.c
Merging crypto/master (ef45b83 crypto: aesni-intel - move more common code to ablk_init_common)
CONFLICT (content): Merge conflict in drivers/crypto/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-common.h
Merging drm/drm-next (4d93914 drm: add plane properties)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/psb_drv.c
Merging sound/for-next (2d41509 Merge branch 'fix/misc' into for-next)
Merging sound-asoc/for-next (abe2c7b Merge branch 'for-3.5' into asoc-next)
Merging quilt/rr (7f14929 virtio: fix typo in comment)
CONFLICT (content): Merge conflict in Documentation/virtual/virtio-spec.txt
Merging input/next (829c4f9 Input: spear-keyboard - add device tree bindings)
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_wac.c
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (2173105 Merge branch 'for-3.5/drivers' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (053388f After the failure of a group of paths, any alternative paths that need initialising do not become available until further I/O is sent to the device. Until this has happened, ioctls return -EAGAIN.)
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 (0caaa95 mmc: at91-mci: this driver is now deprecated)
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 (cac3ecf md: check the return of mddev_find())
Merging mfd/for-next (6fe02e9 gpio: tps65910: dt: process gpio specific device node info)
CONFLICT (content): Merge conflict in include/linux/i2c/twl.h
CONFLICT (content): Merge conflict in drivers/regulator/tps65910-regulator.c
CONFLICT (content): Merge conflict in drivers/mfd/da9052-core.c
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in HEAD and modified in mfd/for-next. Version mfd/for-next of drivers/mfd/ab5500-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
$ git rm -f drivers/mfd/ab5500-core.c
$ git reset --hard HEAD^
Merging refs/next/20120511/mfd
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in HEAD and modified in refs/next/20120511/mfd. Version refs/next/20120511/mfd of drivers/mfd/ab5500-core.c left in tree.
$ git rm -f drivers/mfd/ab5500-core.c
[master 74e1e69] Merge commit 'refs/next/20120511/mfd'
Merging battery/master (96facd2 smb347-charger: Include missing <linux/err.h>)
Merging fbdev/fbdev-next (5e7b911 drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (7c1e25b regulator: palmas: Fix wrong kfree calls)
Merging security/next (ff2bb04 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next)
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 (d194a8f watchdog: Add support for dynamically allocated watchdog_device structs)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (ce74cec Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (8b56a30 exofs: Add SYSFS info for autologin/pNFS export)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (f70d4a9 edac, mips: don't change code that has been removed in edac/mips tree)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
CONFLICT (modify/delete): arch/mips/lantiq/xway/gpio_stp.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/mips/lantiq/xway/gpio_stp.c left in tree.
CONFLICT (modify/delete): arch/mips/lantiq/xway/gpio_ebu.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/mips/lantiq/xway/gpio_ebu.c left in tree.
$ git rm -f sound/soc/imx/Kconfig arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (e374831 Merge branch 'master' into linux-next)
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 (6bd3dbf edac_mc: check for allocation failure in edac_mc_alloc())
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (8d6c1ef Merge branch 'devicetree/merge' into devicetree/next)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging tip/auto-latest (bf474fd Merge branch 'irq/core')
CONFLICT (content): Merge conflict in mm/memory.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
CONFLICT (content): Merge conflict in arch/sh/kernel/process.c
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: kbuild: merge fix for sorting exceptions tables at build time
Applying: sched, numa: Allocate node_queue on any node for offline nodes
Merging rcu/rcu/next (860e1cc rcu: Fix broken strings in RCU's source code.)
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 (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (322728e KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block)
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_para.h
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_segment.S
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (5104b17 KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (105228a Merge branch 'stable/for-linus-3.5' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (641b695 percpu: remove percpu_xxx() functions)
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Merging workqueues/for-next (4d82a1d lockdep: fix oops in processing workqueue)
Merging drivers-x86/linux-next (ad229c5 toshiba_acpi: Add support for transflective LCD)
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 (c948ef3 mfd: palmas PMIC device support Kconfig)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (94ca629 uio_pdrv_genirq: get irq through platform resource if not set otherwise)
Merging tty/tty-next (59bd234 serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.)
Merging usb/usb-next (cda4db5 Merge tag 'for-usb-next-2012-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next)
Merging staging/staging-next (c3c6cc9 Staging: bcm: Remove two unused variables from Adapter.h)
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (169ebd9 writeback: Avoid iput() from flusher thread)
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 (4f6a16b pinctrl: pinctrl-imx: add imx51 pinctrl driver)
Merging tegra/for-next (ef14f5c Merge branch 'for-3.5/defconfig2' into for-next)
Merging moduleh/for-sfr (bb8187d MCA: delete all remaining traces of microchannel bus support.)
Merging vhost/linux-next (53ffd22 virtio-net: remove useless disable on freeze)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
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)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (d48b97b Linux 3.4-rc6)
Merging irqdomain/irqdomain/next (a87487e irqdomain: Document size parameter of irq_domain_add_linear())
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
Merging arm-soc/for-next (71d6afd Merge branch 'late/board' into for-next)
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxs.c
CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/counter_32k.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap4panda.c
CONFLICT (content): Merge conflict in arch/arm/mach-mmp/ttc_dkb.c
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
Merging renesas/next (76ab1e9 Merge branch 'renesas-emev2' into renesas-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Merging s5p/for-next (3bd5eba Merge branch 'next/board-samsung-2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging kvmtool/master (cdb90a0 kvm tools: increase amount of virtio-9p FIDs)
Merging dma-mapping/dma-mapping-next (b7ef7df Merge branch 'for-next-other' into for-next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (700cbdb dma-buf: add vmap interface)
Merging userns/for-next (4b06a81 userns: Silence silly gcc warning.)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in fs/stat.c
Applying: userns: fix up for user_ns move to struct cred
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
Merging signal/for-next (8e5ad56 Merge remote branch 'um/for-linus' into for-next)
CONFLICT (content): Merge conflict in arch/um/Kconfig.common
$ git checkout akpm
Applying: pagemap.h: fix warning about possibly used before init var
Applying: umem: fix up unplugging
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cpuidle: add checks to avoid NULL pointer dereference
Applying: cris: select GENERIC_ATOMIC64
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: drivers/thermal/spear_thermal.c: add Device Tree probing capability
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remove debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: thp, memcg: split hugepage for memcg oom on cow
Applying: mm: do_migrate_pages() calls migrate_to_node() even if task is already on a correct node
Applying: mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix
Applying: mm: do_migrate_pages(): rename arguments
Applying: kernel: cgroup: push rcu read locking from css_is_ancestor() to callsite
Applying: mm: memcg: count pte references from every member of the reclaimed hierarchy
Applying: mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix
Applying: mm: rename is_mlocked_vma() to mlocked_vma_newpage()
Applying: mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix
Applying: mm, thp: drop page_table_lock to uncharge memcg pages
Applying: Documentation: memcg: future proof hierarchical statistics documentation
Applying: Cross Memory Attach: make it Kconfigurable
Applying: bug: introduce BUILD_BUG_ON_INVALID() macro
Applying: bug: completely remove code generated by disabled VM_BUG_ON()
Applying: x86: print e820 physical addresses consistently with other parts of kernel
Applying: x86: print physical addresses consistently with other parts of kernel
Applying: swiotlb: print physical addresses consistently with other parts of kernel
Applying: mm: print physical addresses consistently with other parts of kernel
Applying: kbuild: install kernel-page-flags.h
Applying: tools/vm/page-types.c: cleanups
Applying: mm: move is_vma_temporary_stack() declaration to huge_mm.h
Applying: mm/page_alloc.c: remove pageblock_default_order()
Applying: mm: bootmem: fix checking the bitmap when finally freeing bootmem
Applying: mm: bootmem: remove redundant offset check when finally freeing bootmem
Applying: mm: bootmem: rename alloc_bootmem_core to alloc_bootmem_bdata
Applying: mm: bootmem: split out goal-to-node mapping from goal dropping
Applying: mm: bootmem: allocate in order node+goal, goal, node, anywhere
Applying: mm: bootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: nobootmem: panic on node-specific allocation failure
Applying: mm: nobootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: bootmem: pass pgdat instead of pgdat->bdata down the stack
Applying: mm: remove sparsemem allocation details from the bootmem allocator
Applying: mm-remove-sparsemem-allocation-details-from-the-bootmem-allocator-fix
Applying: mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks
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: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: memcg: add mlock statistic in memory.stat
Applying: memcg-add-mlock-statistic-in-memorystat-fix
Applying: mm/vmscan: store "priority" in struct scan_control
Applying: mm: add link from struct lruvec to struct zone
Applying: mm/vmscan: push lruvec pointer into isolate_lru_pages()
Applying: mm/vmscan: push zone pointer into shrink_page_list()
Applying: mm/vmscan: remove update_isolated_counts()
Applying: mm/vmscan: push lruvec pointer into putback_inactive_pages()
Applying: mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size()
Applying: mm/vmscan: push lruvec pointer into inactive_list_is_low()
Applying: mm/vmscan: push lruvec pointer into shrink_list()
Applying: mm/vmscan: push lruvec pointer into get_scan_count()
Applying: mm/vmscan: push lruvec pointer into should_continue_reclaim()
Applying: mm/vmscan: kill struct mem_cgroup_zone
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
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: CodingStyle: add kmalloc_array() to memory allocators
Applying: introduce SIZE_MAX
Applying: locking: add KERN_CONT when needed to self test
Applying: x86, NMI: add missing KERN_CONT to NMI selftest
Applying: ISDN: add missing KERN_CONT
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: ata/sata_mv: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: kernel/resource.c: correct the comment of allocate_resource()
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix
Applying: task_work_add: generic process-context callbacks
Applying: genirq: reimplement exit_irq_thread() hook via task_work_add()
Applying: keys: change keyctl_session_to_parent() to use task_work_add()
Applying: keys: kill the dummy key_replace_session_keyring()
Applying: keys: kill task_struct->replacement_session_keyring
Applying: kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
Applying: drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
Applying: drivers-video-backlight-apple_blc-include-header-for-exported-symbol-prototypes-fix
Applying: backlight: add LM3533 backlight driver
Applying: backlight-add-lm3533-backlight-driver-fix
Applying: backlight-add-lm3533-backlight-driver-fix-fix
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-v5
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: leds: add new transient trigger for one shot timer activation
Applying: drivers/leds/leds-pca955x.c: fix race condition while setting brightness on several LEDs
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: radix-tree: fix preload vector size
Applying: lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: init: disable sparse checking of the mount.o source files
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
Applying: drivers/rtc/rtc-lpc32xx.c: add device tree support
Applying: nilfs2: flush disk caches in syncing
Applying: HPFS: remove PRINTK() macro
Applying: fat: introduce special inode for managing the FSINFO block
Applying: fat: introduce mark_fsinfo_dirty helper
Applying: fat: mark superblock as dirty less often
Applying: fat: switch to fsinfo_inode
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.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: report file/anon bit in /proc/pid/pagemap
Applying: proc/smaps: carefully handle migration entries
Applying: proc/smaps: show amount of nonlinear ptes in vma
Applying: proc/smaps: show amount of hwpoison pages
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: cpu: introduce clear_tasks_mm_cpumask() helper
Applying: arm: use clear_tasks_mm_cpumask()
Applying: powerpc: use clear_tasks_mm_cpumask()
Applying: sh: use clear_tasks_mm_cpumask()
Applying: blackfin: a couple of task->mm handling fixes
Applying: blackfin: fix possible deadlock in decode_address()
Applying: um: should hold tasklist_lock while traversing processes
Applying: um: fix possible race on task->mm
Applying: um: properly check all process' threads for a live mm
Applying: kernel/cpu.c: document clear_tasks_mm_cpumask()
Applying: kernel-cpuc-document-clear_tasks_mm_cpumask-fix
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Applying: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: ipc/mqueue: improve performance of send/recv
Applying: ipc-mqueue-improve-performance-of-send-recv-fix
Applying: ipc/mqueue: correct mq_attr_ok test
Applying: ipc-mqueue-correct-mq_attr_ok-test-fix
Applying: ipc/mqueue: strengthen checks on mqueue creation
Applying: ipc-mqueue-strengthen-checks-on-mqueue-creation-fix
Applying: tools/selftests: add mq_perf_tests
Applying: tools-selftests-add-mq_perf_tests-checkpatch-fixes
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: pidns: use task_active_pid_ns in do_notify_parent
Applying: pidns: guarantee that the pidns init will be the last pidns process reaped
Applying: pidns: make killed children autoreap
Applying: pidns-make-killed-children-autoreap-checkpatch-fixes
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: c/r: fs, proc: Move children entry back to tid_base_stuff
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
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: simplify PR_SET_MM on mm::code/data assignment
Applying: c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Applying: isdn-add-missing-kern_cont-fix
Merging quilt/akpm (900cd0f isdn-add-missing-kern_cont-fix)
Applying: sparc: fix bad merge of sparc Kconfig
Applying: watchdog: usin IS_ERR needs linux/err.h
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [patch -linus] regmap: REMAP_IRQ should select IRQ_DOMAIN itself
From: David Rientjes @ 2012-05-23 6:57 UTC (permalink / raw)
To: Randy Dunlap, Linus Torvalds
Cc: Stephen Rothwell, linux-next, Mark Brown, linux-kernel
In-Reply-To: <4FBBAF1B.1070702@xenotime.net>
On Tue, 22 May 2012, Randy Dunlap wrote:
> on i386:
>
> drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_thread':
> drivers/base/regmap/regmap-irq.c:146:4: error: implicit declaration of function 'irq_find_mapping'
> drivers/base/regmap/regmap-irq.c: At top level:
> drivers/base/regmap/regmap-irq.c:179:11: error: 'irq_domain_xlate_twocell' undeclared here (not in a function)
> drivers/base/regmap/regmap-irq.c: In function 'regmap_add_irq_chip':
> drivers/base/regmap/regmap-irq.c:272:3: error: implicit declaration of function 'irq_domain_add_legacy'
> drivers/base/regmap/regmap-irq.c:272:13: warning: assignment makes pointer from integer without a cast
> drivers/base/regmap/regmap-irq.c:276:3: error: implicit declaration of function 'irq_domain_add_linear'
> drivers/base/regmap/regmap-irq.c:276:13: warning: assignment makes pointer from integer without a cast
> drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_get_virq':
> drivers/base/regmap/regmap-irq.c:349:2: error: implicit declaration of function 'irq_create_mapping'
>
> Full randconfig file is attached.
>
This brekage has already made it to Linus and doesn't only affect i386.
It happens because CONFIG_MFD_PALMAS doesn't select CONFIG_IRQ_DOMAIN like
the rest of the options that were patched in 4af8be67fd99 ("regmap:
Convert regmap_irq to use irq_domain"). This is the only remaining
Kconfig entry that selects CONFIG_REGMAP_IRQ and misses CONFIG_IRQ_DOMAIN.
regmap: REMAP_IRQ should select IRQ_DOMAIN itself
CONFIG_REGMAP_IRQ relies on CONFIG_IRQ_DOMAIN since 4af8be67fd99 ("regmap:
Convert regmap_irq to use irq_domain").
Instead of ensuring all options that select REGMAP_IRQ also select
IRQ_DOMAIN, just make the former select the latter itself.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David Rientjes <rientjes@google.com>
---
drivers/base/regmap/Kconfig | 1 +
drivers/mfd/Kconfig | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -19,3 +19,4 @@ config REGMAP_MMIO
config REGMAP_IRQ
bool
+ select IRQ_DOMAIN
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -377,7 +377,6 @@ config PMIC_DA9052
config MFD_DA9052_SPI
bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"
- select IRQ_DOMAIN
select REGMAP_SPI
select REGMAP_IRQ
select PMIC_DA9052
@@ -390,7 +389,6 @@ config MFD_DA9052_SPI
config MFD_DA9052_I2C
bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"
- select IRQ_DOMAIN
select REGMAP_I2C
select REGMAP_IRQ
select PMIC_DA9052
@@ -561,7 +559,6 @@ config MFD_WM8994
bool "Support Wolfson Microelectronics WM8994"
select MFD_CORE
select REGMAP_I2C
- select IRQ_DOMAIN
select REGMAP_IRQ
depends on I2C=y && GENERIC_HARDIRQS
help
^ permalink raw reply
* linux-next: build failure after merge of the final tree (watchdog tree related)
From: Stephen Rothwell @ 2012-05-23 6:55 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-next, linux-kernel, Alan Cox, Hans de Goede
[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:
drivers/watchdog/watchdog_core.c: In function 'watchdog_register_device':
drivers/watchdog/watchdog_core.c:109:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
drivers/watchdog/watchdog_core.c:112:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]
Caused by commit e3b97a7eb87d ("watchdog: create all the proper device
files").
I have applied this fixup patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 May 2012 16:52:07 +1000
Subject: [PATCH] watchdog: usin IS_ERR needs linux/err.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/watchdog/watchdog_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 534ed2a..1b42936 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -35,6 +35,7 @@
#include <linux/watchdog.h> /* For watchdog specific items */
#include <linux/init.h> /* For __init/__exit/... */
#include <linux/idr.h> /* For ida_* macros */
+#include <linux/err.h>
#include "watchdog_core.h" /* For watchdog_dev_register/... */
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the usb tree with the v4l-dvb tree
From: Greg KH @ 2012-05-23 6:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Mauro Carvalho Chehab,
"Ezequiel García"
In-Reply-To: <20120521160624.a5e16748fb11670778ea9b3f@canb.auug.org.au>
On Mon, May 21, 2012 at 04:06:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/staging/media/easycap/easycap_main.c between various commits from
> the v4l-dvb tree and commit 5df773120477 ("USB: Staging: media: easycap:
> remove err() usage") from the usb tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
This looks correct, thanks.
greg k-h
^ permalink raw reply
* linux-next: manual merge of the signal tree with the tip tree
From: Stephen Rothwell @ 2012-05-23 6:02 UTC (permalink / raw)
To: Al Viro
Cc: linux-next, linux-kernel, Richard Weinberger, Anna-Maria Gleixner,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time
config") from the tip tree and commit 985a94a96d29 ("um: Remove
CONFIG_IRQ_RELEASE_METHOD") from the signal tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/um/Kconfig.common
index 806185d,43ef890..0000000
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@@ -53,11 -52,10 +53,6 @@@ config GENERIC_BU
default y
depends on BUG
- # Used in kernel/irq/manage.c and include/linux/irq.h
- config IRQ_RELEASE_METHOD
- bool
- default y
-
-config GENERIC_CLOCKEVENTS
- bool
- default y
-
config HZ
int
default 100
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the watchdog tree with the mfd tree
From: Wim Van Sebroeck @ 2012-05-23 5:44 UTC (permalink / raw)
To: Guenter Roeck
Cc: Stephen Rothwell, linux-next, linux-kernel, Aaron Sierra,
Samuel Ortiz, Randy Dunlap, linux-watchdog, Jean Delvare
In-Reply-To: <6.2.5.6.2.20120522153050.0284ee38@roeck-us.net>
Hi Sam,
Since %04llx with a typecast to u64 is the way to go (Thanks Stephen and Randy)...
> How do we make sure that Randy's patch makes it upstream ? The iTCO
> patch is currently in Sam's tree.
Can you carry Randy's patch/fix (since it fixes the change introduced by the iTCO_wdt mfd patch)?
If not then I will apply the patch later on once the iTCO_wdt mfd patch is mainstream.
Kind regards,
Wim.
^ permalink raw reply
* Re: signal.git
From: Stephen Rothwell @ 2012-05-23 5:30 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next
In-Reply-To: <20120523052234.GM11775@ZenIV.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 2655 bytes --]
Hi Al,
On Wed, 23 May 2012 06:22:35 +0100 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> Sorry for not having done that earlier; the tree is at
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal #for-next.
> No non-trivial conflicts with akpm-base - only arch/*/Kconfig ones
> coming from mainline. A _lot_ of duplicates with akpm - 20 commits
> from Matt and Oleg are all cherry-picked from there.
>
> I've included the recent uml.git pull request in there -
> it's not in -next (and probably ought to be) and this time it
> has a lot to do with the stuff being dealt with here.
>
> I hope to get task_work_add() series through that tree,
> once all prereqs are there; I'll send heads-up before doing that,
> since those patches are currently in akpm's patchset (and unfortunately
> they do need a bunch of commits not in there to get them working on
> all architectures - some of those prereqs are in this branch, some
> will need to be moved to it from signal.git#master)
OK, since a lot of this has been in Andrew's patch series for a while, I
will add this tree today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* signal.git
From: Al Viro @ 2012-05-23 5:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Sorry for not having done that earlier; the tree is at
git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal #for-next.
No non-trivial conflicts with akpm-base - only arch/*/Kconfig ones
coming from mainline. A _lot_ of duplicates with akpm - 20 commits
from Matt and Oleg are all cherry-picked from there.
I've included the recent uml.git pull request in there -
it's not in -next (and probably ought to be) and this time it
has a lot to do with the stuff being dealt with here.
I hope to get task_work_add() series through that tree,
once all prereqs are there; I'll send heads-up before doing that,
since those patches are currently in akpm's patchset (and unfortunately
they do need a bunch of commits not in there to get them working on
all architectures - some of those prereqs are in this branch, some
will need to be moved to it from signal.git#master)
^ permalink raw reply
* [patch] sched, numa: Allocate node_queue on any node for offline nodes
From: David Rientjes @ 2012-05-23 4:17 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, Thomas Gleixner, Peter Zijlstra
Cc: Stephen Rothwell, linux-kernel, linux-next, linuxppc-dev,
Lee Schermerhorn, Linus Torvalds
In-Reply-To: <20120522130354.fdb335eb294f4206b4b2fed5@canb.auug.org.au>
struct node_queue must be allocated with NUMA_NO_NODE for nodes that are
not (yet) online, otherwise the page allocator has a bad zonelist and
results in an early crash.
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David Rientjes <rientjes@google.com>
---
kernel/sched/numa.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c
--- a/kernel/sched/numa.c
+++ b/kernel/sched/numa.c
@@ -885,7 +885,8 @@ static __init int numa_init(void)
for_each_node(node) {
struct node_queue *nq = kmalloc_node(sizeof(*nq),
- GFP_KERNEL | __GFP_ZERO, node);
+ GFP_KERNEL | __GFP_ZERO,
+ node_online(node) ? node : NUMA_NO_NODE);
BUG_ON(!nq);
spin_lock_init(&nq->lock);
^ permalink raw reply
* Re: linux-next: triage for May 22, 2012
From: Stephen Rothwell @ 2012-05-23 3:08 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
In-Reply-To: <20120523010457.GA4816@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
Hi Paul,
On Tue, 22 May 2012 21:04:57 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> sparc:defconfig
> when: May 22
> why: sparc/kernel/time_32.c: inval use undef type 'struct clock_event_device'
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/
A bad merge in my tree - will be fixed today.
> sparc:allnoconfig
> when: May 22
> why: arch/sparc/kernel/time_32.c: invalid use of undef 'struct clock_event_device'
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6348424/
Ditto
--
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
* linux-next: manual merge of the mfd tree with Linus' tree
From: Stephen Rothwell @ 2012-05-23 3:01 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Linus Walleij, Lee Jones
[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu:
delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete
AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove
confusing ab8500-i2c file and merge into ab8500-core") from the mfd 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/mfd/Makefile
index 43672b8,afe96b2..0000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -87,12 -91,14 +91,11 @@@ obj-$(CONFIG_PCF50633_GPIO) += pcf50633
obj-$(CONFIG_ABX500_CORE) += abx500-core.o
obj-$(CONFIG_AB3100_CORE) += ab3100-core.o
obj-$(CONFIG_AB3100_OTP) += ab3100-otp.o
obj-$(CONFIG_AB8500_DEBUG) += ab8500-debugfs.o
obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o
obj-$(CONFIG_MFD_DB8500_PRCMU) += db8500-prcmu.o
- # ab8500-i2c need to come after db8500-prcmu (which provides the channel)
- obj-$(CONFIG_AB8500_I2C_CORE) += ab8500-i2c.o
+ # ab8500-core need to come after db8500-prcmu (which provides the channel)
+ obj-$(CONFIG_AB8500_CORE) += ab8500-core.o ab8500-sysctrl.o
-obj-$(CONFIG_MFD_DB5500_PRCMU) += db5500-prcmu.o
obj-$(CONFIG_MFD_TIMBERDALE) += timberdale.o
obj-$(CONFIG_PMIC_ADP5520) += adp5520.o
obj-$(CONFIG_LPC_SCH) += lpc_sch.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: bad merge in the block tree
From: Stephen Rothwell @ 2012-05-23 2:35 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
Hi Jens,
Commit 21731057017b ("Merge branch 'for-3.5/drivers' into for-next") has
left a conflict marker in Documentation/feature-removal-schedule.txt ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] x86: auto poll/interrupt mode switch for CMC to stop CMC storm
From: Chen Gong @ 2012-05-23 2:30 UTC (permalink / raw)
To: Chen Gong; +Cc: tony.luck, bp, linux-next
In-Reply-To: <1337740225-26673-1-git-send-email-gong.chen@linux.intel.com>
于 2012/5/23 10:30, Chen Gong 写道:
> This idea is inspired from IA64 implementation. It is like NAPI for
> network stack. When CMCI is too many to handle, this interrupt can
> be disabled and then poll mode will take over the events handle.
> When no more events happen in the system, CMC interrupt can be
> enabled automatically.
>
> Signed-off-by: Chen Gong <gong.chen@linux.intel.com> ---
> arch/x86/kernel/cpu/mcheck/mce.c | 83
> +++++++++++++++++++++++++++++++++++++- 1 file changed, 81
> insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/mcheck/mce.c
> b/arch/x86/kernel/cpu/mcheck/mce.c index d086a09..6334f0d 100644
> --- a/arch/x86/kernel/cpu/mcheck/mce.c +++
> b/arch/x86/kernel/cpu/mcheck/mce.c @@ -92,6 +92,7 @@ static char
> *mce_helper_argv[2] = { mce_helper, NULL };
>
> static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait);
>
> +static DEFINE_PER_CPU(struct timer_list, mce_timer); static
> DEFINE_PER_CPU(struct mce, mces_seen); static int cpu_missing;
>
> @@ -100,8 +101,28 @@ DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) =
> { [0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL };
>
> +#define CMC_POLL_INTERVAL (1 * 30) +#define CMC_STORM 5 +static
> DEFINE_PER_CPU(int, cmci_storm_warning); +static
> DEFINE_PER_CPU(unsigned long, first_cmci_jiffie); +static
> DEFINE_SPINLOCK(cmc_poll_lock); + +/* + * This variable tells
> whether we are in cmci-storm-happened mode. + * Start with this in
> the wrong state so we won't play w/ timers + * before the system is
> ready. + */ +static int cmci_storm_detected = 1; + static
> DEFINE_PER_CPU(struct work_struct, mce_work);
>
> +static void mce_disable_cmci(void *data); +static void
> mce_enable_ce(void *all); +static void cmc_disable_keventd(struct
> work_struct *dummy); +static void cmc_enable_keventd(struct
> work_struct *dummy); + +static DECLARE_WORK(cmc_disable_work,
> cmc_disable_keventd); +static DECLARE_WORK(cmc_enable_work,
> cmc_enable_keventd); /* * CPU/chipset specific EDAC code can
> register a notifier call here to print * MCE errors in a
> human-readable form. @@ -582,6 +603,37 @@ void
> machine_check_poll(enum mcp_flags flags, mce_banks_t *b) { struct
> mce m; int i; + unsigned long flag; + +
> spin_lock_irqsave(&cmc_poll_lock, flag); + if (cmci_storm_detected
> == 0) { + unsigned long now = jiffies; + int *count =
> &__get_cpu_var(cmci_storm_warning); + unsigned long *history =
> &__get_cpu_var(first_cmci_jiffie); + + if (time_before_eq(now,
> *history + HZ)) + (*count)++; + else { + *count = 0; +
> *history = now; + } + + if (*count >= CMC_STORM) { +
> cmci_storm_detected = 1; + /* If we're being hit with CMC
> interrupts, we won't + * ever execute the schedule_work() below.
> Need to + * disable CMC interrupts on this processor now. +
> */ + mce_disable_cmci(NULL); + if
> (!work_pending(&cmc_disable_work)) +
> schedule_work(&cmc_disable_work); +
> spin_unlock_irqrestore(&cmc_poll_lock, flag); +
> printk(KERN_WARNING "WARNING: Switching to polling "\ + "CMC
> handler; error records may be lost\n"); + goto out; + } + } +
> spin_unlock_irqrestore(&cmc_poll_lock, flag);
>
> percpu_inc(mce_poll_count);
>
> @@ -628,6 +680,7 @@ void machine_check_poll(enum mcp_flags flags,
> mce_banks_t *b) mce_wrmsrl(MSR_IA32_MCx_STATUS(i), 0); }
>
> +out: /* * Don't clear MCG_STATUS here because it's only defined
> for * exceptions. @@ -1199,6 +1252,20 @@ static void
> mce_process_work(struct work_struct *dummy) memory_failure(pfn,
> MCE_VECTOR, 0); }
>
> +static void cmc_disable_keventd(struct work_struct *dummy) +{ +
> struct timer_list *t = __this_cpu_ptr(&mce_timer); + +
> on_each_cpu(mce_disable_cmci, NULL, 0); + mod_timer(t, jiffies +
> CMC_POLL_INTERVAL * HZ); +} + +static void
> cmc_enable_keventd(struct work_struct *dummy) +{ + /* don't
> re-initiate timer */ + on_each_cpu(mce_enable_ce, NULL, 0); +} +
> #ifdef CONFIG_X86_MCE_INTEL /*** * mce_log_therm_throt_event - Logs
> the thermal throttling event to mcelog @@ -1232,12 +1299,12 @@ void
> mce_log_therm_throt_event(__u64 status) static int check_interval =
> 5 * 60; /* 5 minutes */
>
> static DEFINE_PER_CPU(int, mce_next_interval); /* in jiffies */
> -static DEFINE_PER_CPU(struct timer_list, mce_timer);
>
> static void mce_start_timer(unsigned long data) { struct timer_list
> *t = &per_cpu(mce_timer, data); int *n; + unsigned long flags;
>
> WARN_ON(smp_processor_id() != data);
>
> @@ -1253,8 +1320,19 @@ static void mce_start_timer(unsigned long
> data) n = &__get_cpu_var(mce_next_interval); if (mce_notify_irq())
> *n = max(*n/2, HZ/100); - else + else { *n = min(*n*2,
> (int)round_jiffies_relative(check_interval*HZ)); + /* if no CMC
> event, switch out of polling mode */ +
> spin_lock_irqsave(&cmc_poll_lock, flags); + if
> (cmci_storm_detected == 1) { + printk(KERN_WARNING "Returning to
> interrupt driven "\ + "CMC handler\n"); + if
> (!work_pending(&cmc_enable_work)) +
> schedule_work(&cmc_enable_work); + cmci_storm_detected = 0; + }
> + spin_unlock_irqrestore(&cmc_poll_lock, flags); + }
>
> t->expires = jiffies + *n; add_timer_on(t, smp_processor_id()); @@
> -1547,6 +1625,7 @@ void __cpuinit mcheck_cpu_init(struct
> cpuinfo_x86 *c) __mcheck_cpu_init_generic();
> __mcheck_cpu_init_vendor(c); __mcheck_cpu_init_timer(); +
> cmci_storm_detected = 0; INIT_WORK(&__get_cpu_var(mce_work),
> mce_process_work); init_irq_work(&__get_cpu_var(mce_irq_work),
> &mce_irq_work_cb); }
Oops, I send it to wrong LKML address. I will send this patch again.
^ permalink raw reply
* [PATCH] x86: auto poll/interrupt mode switch for CMC to stop CMC storm
From: Chen Gong @ 2012-05-23 2:30 UTC (permalink / raw)
To: tony.luck, bp; +Cc: x86, linux-next, Chen Gong
This idea is inspired from IA64 implementation. It is like
NAPI for network stack. When CMCI is too many to handle,
this interrupt can be disabled and then poll mode will take
over the events handle. When no more events happen in the
system, CMC interrupt can be enabled automatically.
Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
---
arch/x86/kernel/cpu/mcheck/mce.c | 83 +++++++++++++++++++++++++++++++++++++-
1 file changed, 81 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index d086a09..6334f0d 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -92,6 +92,7 @@ static char *mce_helper_argv[2] = { mce_helper, NULL };
static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait);
+static DEFINE_PER_CPU(struct timer_list, mce_timer);
static DEFINE_PER_CPU(struct mce, mces_seen);
static int cpu_missing;
@@ -100,8 +101,28 @@ DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
[0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
};
+#define CMC_POLL_INTERVAL (1 * 30)
+#define CMC_STORM 5
+static DEFINE_PER_CPU(int, cmci_storm_warning);
+static DEFINE_PER_CPU(unsigned long, first_cmci_jiffie);
+static DEFINE_SPINLOCK(cmc_poll_lock);
+
+/*
+ * This variable tells whether we are in cmci-storm-happened mode.
+ * Start with this in the wrong state so we won't play w/ timers
+ * before the system is ready.
+ */
+static int cmci_storm_detected = 1;
+
static DEFINE_PER_CPU(struct work_struct, mce_work);
+static void mce_disable_cmci(void *data);
+static void mce_enable_ce(void *all);
+static void cmc_disable_keventd(struct work_struct *dummy);
+static void cmc_enable_keventd(struct work_struct *dummy);
+
+static DECLARE_WORK(cmc_disable_work, cmc_disable_keventd);
+static DECLARE_WORK(cmc_enable_work, cmc_enable_keventd);
/*
* CPU/chipset specific EDAC code can register a notifier call here to print
* MCE errors in a human-readable form.
@@ -582,6 +603,37 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
{
struct mce m;
int i;
+ unsigned long flag;
+
+ spin_lock_irqsave(&cmc_poll_lock, flag);
+ if (cmci_storm_detected == 0) {
+ unsigned long now = jiffies;
+ int *count = &__get_cpu_var(cmci_storm_warning);
+ unsigned long *history = &__get_cpu_var(first_cmci_jiffie);
+
+ if (time_before_eq(now, *history + HZ))
+ (*count)++;
+ else {
+ *count = 0;
+ *history = now;
+ }
+
+ if (*count >= CMC_STORM) {
+ cmci_storm_detected = 1;
+ /* If we're being hit with CMC interrupts, we won't
+ * ever execute the schedule_work() below. Need to
+ * disable CMC interrupts on this processor now.
+ */
+ mce_disable_cmci(NULL);
+ if (!work_pending(&cmc_disable_work))
+ schedule_work(&cmc_disable_work);
+ spin_unlock_irqrestore(&cmc_poll_lock, flag);
+ printk(KERN_WARNING "WARNING: Switching to polling "\
+ "CMC handler; error records may be lost\n");
+ goto out;
+ }
+ }
+ spin_unlock_irqrestore(&cmc_poll_lock, flag);
percpu_inc(mce_poll_count);
@@ -628,6 +680,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
mce_wrmsrl(MSR_IA32_MCx_STATUS(i), 0);
}
+out:
/*
* Don't clear MCG_STATUS here because it's only defined for
* exceptions.
@@ -1199,6 +1252,20 @@ static void mce_process_work(struct work_struct *dummy)
memory_failure(pfn, MCE_VECTOR, 0);
}
+static void cmc_disable_keventd(struct work_struct *dummy)
+{
+ struct timer_list *t = __this_cpu_ptr(&mce_timer);
+
+ on_each_cpu(mce_disable_cmci, NULL, 0);
+ mod_timer(t, jiffies + CMC_POLL_INTERVAL * HZ);
+}
+
+static void cmc_enable_keventd(struct work_struct *dummy)
+{
+ /* don't re-initiate timer */
+ on_each_cpu(mce_enable_ce, NULL, 0);
+}
+
#ifdef CONFIG_X86_MCE_INTEL
/***
* mce_log_therm_throt_event - Logs the thermal throttling event to mcelog
@@ -1232,12 +1299,12 @@ void mce_log_therm_throt_event(__u64 status)
static int check_interval = 5 * 60; /* 5 minutes */
static DEFINE_PER_CPU(int, mce_next_interval); /* in jiffies */
-static DEFINE_PER_CPU(struct timer_list, mce_timer);
static void mce_start_timer(unsigned long data)
{
struct timer_list *t = &per_cpu(mce_timer, data);
int *n;
+ unsigned long flags;
WARN_ON(smp_processor_id() != data);
@@ -1253,8 +1320,19 @@ static void mce_start_timer(unsigned long data)
n = &__get_cpu_var(mce_next_interval);
if (mce_notify_irq())
*n = max(*n/2, HZ/100);
- else
+ else {
*n = min(*n*2, (int)round_jiffies_relative(check_interval*HZ));
+ /* if no CMC event, switch out of polling mode */
+ spin_lock_irqsave(&cmc_poll_lock, flags);
+ if (cmci_storm_detected == 1) {
+ printk(KERN_WARNING "Returning to interrupt driven "\
+ "CMC handler\n");
+ if (!work_pending(&cmc_enable_work))
+ schedule_work(&cmc_enable_work);
+ cmci_storm_detected = 0;
+ }
+ spin_unlock_irqrestore(&cmc_poll_lock, flags);
+ }
t->expires = jiffies + *n;
add_timer_on(t, smp_processor_id());
@@ -1547,6 +1625,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
__mcheck_cpu_init_generic();
__mcheck_cpu_init_vendor(c);
__mcheck_cpu_init_timer();
+ cmci_storm_detected = 0;
INIT_WORK(&__get_cpu_var(mce_work), mce_process_work);
init_irq_work(&__get_cpu_var(mce_irq_work), &mce_irq_work_cb);
}
--
1.7.10
^ permalink raw reply related
* linux-next: manual merge of the rr tree with Linus' tree
From: Stephen Rothwell @ 2012-05-23 2:15 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
Documentation/virtual/virtio-spec.txt between commit 33950c6e2269
("virtio: update documentation to v0.9.5 of spec") from Linus' tree and
commit e26259736de5 ("virtio: update documentation to v0.9.4 of spec")
from the rr tree.
I just used the version from Linus' tree.
--
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
From: Stephen Rothwell @ 2012-05-23 2:08 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel
In-Reply-To: <20120522.150525.1965961563976193101.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]
Hi Dave,
On Tue, 22 May 2012 15:05:25 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 22 May 2012 18:20:10 +1000
>
> > After merging the final tree, today's linux-next build (sparc32 defconfig)
> > failed like this:
> >
> > arch/sparc/kernel/time_32.c: In function 'timer_interrupt':
> > arch/sparc/kernel/time_32.c:105:3: error: invalid use of undefined type 'struct clock_event_device'
> ...
> > I have no idea what caused this, I did not get this yesterday. I have
> > left this build broken for today.
>
> It builds cleanly in Linus's tree, and I have no local changes in sparc-next.
I bisected it down to my merge of the tip tree (commit 26b38c5887 in
next-20120522). I only enable GENERIC_CLOCKEVENTS for sparc64 - I missed
a subtle interaction between commit 62f082830d63 ("sparc32: generic
clockevent support") from the sparc-next tree and commit ded1cc5cfc3b
("sparc: Use: generic time config") from the tip tree.
I will fix this up in linux-next today. Sorry for the noise.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: triage for May 22, 2012
From: Paul Gortmaker @ 2012-05-23 1:04 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
With the merge window open, it is as good a time as any to catch up on
the failures in linux-next. Please have a look to see if any of these
build failures might be related to your commits.
---------------------
New breakage since last report:
ARM:netx_defconfig (mach-netx/fb.c: redefinition of 'clk_disable')
ARM:u8500_defconfig (No rule to make `arch/arm/mach-ux500/pins.o')
ARM:imx_v4_v5_defconfig (video/mx2_camera.c: 'pixfmt' undeclared)
ARM:tegra_defconfig (tegra-smmu.c: implicit decl 'of_get_dma_window')
blackfin: (implicit declaration of function 'UART_PUT_CLK')
ia64: (kernel/sched/numa.c: initializer element is not constant)
sh4: (kernel/process.c:23: implicit decl of function 'unlazy_fpu')
Randconfig fails that may or may not be new (by their very nature):
i386: include/asm/uaccess_32.h: call to 'copy_from_user_overflow'
declared with attribute error: copy_from_user() buffer size
is not provably correct [fs/binfmt_misc.o] Error 1
Builds that are fixed since last report:
ARM:badge4_defconfig,jornada720_defconfig,neponset_defconfig,cm_x2xx_defconfig
arch/arm/common/dmabounce.c: 'generic_dma_map_sg' undeclared
ARM:integrator_defconfig "implicit decl of function 'pci_std_swizzle'
ARM:at91x40_defconfig
arch/arm/mm/dma-mapping.c: 'pgprot_kernel' undeclared
ARM:mv78xx0_defconfig
mach-mv78xx0/pcie.c:256:29: error: 'bus' undeclared
ARM:xcep_defconfig,marzen_defconfig
fs/inode.c:1777:6: error: redefinition of 'inode_dio_wait'
frv: static declaration of 'alloc_task_struct_node' follows non-static
----------------------
Note1: The randconfig fails are only listed once and not tracked
in the below listing.
Note2: Build fails that are perpetual and/or unlikely to ever
get fixed are not tracked here.
Note3: Issues that Stephen finds and reverts/avoids before kicking
off the all-arch/all-config builds are also not tracked here.
Note4: I'm also not tracking the kallsyms extra pass 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/linux-next
Failures as of this report:
===========================
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:imx_v4_v5_defconfig:
when: May 21
why: video/mx2_camera.c: 'pixfmt' undeclared
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6342390/
ARM:u8500_defconfig
when: May sometime
why: No rule to make `arch/arm/mach-ux500/pins.o'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/
ARM:at91x40_defconfig
when: May10
why: arch/arm/mm/dma-mapping.c: 'pgprot_kernel' undeclared
status: bisected and reported (see linux-next mail)
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6291233/
ARM:mv78xx0_defconfig
when: May 4
why: mach-mv78xx0/pcie.c:256:29: error: 'bus' undeclared
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243629/
ARM:bcmring_defconfig
when: Apr 20ish
why: usr/include/asm/kvm_para.h:1: included file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228994/
ARM:ezx_defconfig
when: Apr 19 (possibly earlier?)
why: ezx-pcap.c: implicit declaration of function 'irq_to_gpio'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131924/
ARM:netx_defconfig
when: May sometime
why: arch/arm/mach-netx/fb.c: redefinition of 'clk_disable'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6348432/
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
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.
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6248032/
---------------
blackfin:
when: May 21
why: implicit declaration of function 'UART_PUT_CLK'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6342312/
blackfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
blackfin:SMP
when May 1
why: kernel/smp.c:724: undefined reference to `smp_call_function_many'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228892/
---------------
cris:etrax-100lx_defconfig
when: May 7
why: drivers/tty/serial/crisv10.c: macro "wait_event_interruptible_tty" requires 3 args, only 2 given
why: drivers/tty/serial/crisv10.c: 'wait_event_interruptible_tty' undecl
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
ia64: defconfig
when:
why: kernel/sched/numa.c:21: initializer element is not constant
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6342563/
----------------
i386:allmodconfig
when: May11
why: input/misc/twl6040-vibra.c: implicit decl 'of_property_read_u32
status: reported on linux-next ; needs a Kbuild arch dependency
i386:allnoconfig
when: May11
why: perf_event_amd.c:(.text+0xc0b0): undefined reference to `get_ibs_caps'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6291419/
----------------
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)
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
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
mips:allmodconfig
when: Apr 17
why: sound/oss/soundcard.c: 'MAX_DMA_CHANNELS' undeclared
status: one of many fixes mips needs...
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091660/
----------------
parisc:defconfig
when: Apr 20
why: file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6137786/
parisc:allmodconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
ref: http://www.spinics.net/lists/linux-parisc/msg04100.html
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
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allmodconfig
when: May 11
why: ERROR: ".of_mdio_find_bus" [phy/mdio-mux.ko] undefined!
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6291463/
------------------
sh4:allnoconfig
when: May 22
why: kernel/process.c:23: implicit decl of function 'unlazy_fpu'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6342503/
sh4:edosk7705_defconfig
when: May 9
why: kernel/printk.c:1423: 'LOG_LINE_MAX' undeclared
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6276831/
------------------
sparc:defconfig
when: May 22
why: sparc/kernel/time_32.c: inval use undef type 'struct clock_event_device'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/
sparc[64]:allyesconfig,allmodconfig
when: Apr 18
why: usr/include/asm/kvm_para.h: included file 'asm-generic/kvm_para.h' is not exported
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6243021/
sparc:allnoconfig
when: May 22
why: arch/sparc/kernel/time_32.c: invalid use of undef 'struct clock_event_device'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6348424/
------------------
tile:defconfig
when: May 22
why: include/asm-generic/unistd.h:695: 'compat_sys_ms_mbind' undeclared here
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6348989/
------------------
xtensa:defconfig
when: Apr 20
why: undefined reference to `_sdata'
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6228970/
^ permalink raw reply
* Re: Bad ux500 merge fix leads to linux-next failure
From: Olof Johansson @ 2012-05-23 0:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-arm-kernel, linux-next
In-Reply-To: <20120523000346.GB3610@windriver.com>
Hi,
Yeah, there was some confusion earlier, and I noticed that when
staging the branches for Linus last night. I'll rebuild for-next
tonight and take care of it then, thanks for the reminder!
-Olof
On Tue, May 22, 2012 at 5:03 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> Hi Olof,
>
> This change:
>
> - id.o usb.o timer.o
> + id.o pins.o usb.o timer.o
>
> breaks the u8500_defconfig as follows:
>
> make[2]: *** No rule to make target `arch/arm/mach-ux500/pins.o', needed
> by `arch/arm/mach-ux500/built-in.o'. Stop.
> make[1]: *** [arch/arm/mach-ux500/] Error 2
> make: *** [sub-make] Error 2
>
> A bisect shows the following:
>
> cda6f4d8cae969e08e6662573b538db73191873b is the first bad commit
> commit cda6f4d8cae969e08e6662573b538db73191873b
> Author: Olof Johansson <olof@lixom.net>
> Date: Wed May 16 14:47:24 2012 -0700
>
> ARM: ux500: fix mismerge in for-next
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
>
> :040000 040000 abc42227f7daa6a7ff6153e0908add25ffb38a54
> 45d2618822e6075aea188089191791091c2e5c38 M arch
> bisect run success
>
> The linux-next fail is here:
> http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/
>
> Can you have a look please?
>
> Thanks,
> Paul.
^ permalink raw reply
* Bad ux500 merge fix leads to linux-next failure
From: Paul Gortmaker @ 2012-05-23 0:03 UTC (permalink / raw)
To: Olof Johansson; +Cc: linux-arm-kernel, linux-next
Hi Olof,
This change:
- id.o usb.o timer.o
+ id.o pins.o usb.o timer.o
breaks the u8500_defconfig as follows:
make[2]: *** No rule to make target `arch/arm/mach-ux500/pins.o', needed
by `arch/arm/mach-ux500/built-in.o'. Stop.
make[1]: *** [arch/arm/mach-ux500/] Error 2
make: *** [sub-make] Error 2
A bisect shows the following:
cda6f4d8cae969e08e6662573b538db73191873b is the first bad commit
commit cda6f4d8cae969e08e6662573b538db73191873b
Author: Olof Johansson <olof@lixom.net>
Date: Wed May 16 14:47:24 2012 -0700
ARM: ux500: fix mismerge in for-next
Signed-off-by: Olof Johansson <olof@lixom.net>
:040000 040000 abc42227f7daa6a7ff6153e0908add25ffb38a54
45d2618822e6075aea188089191791091c2e5c38 M arch
bisect run success
The linux-next fail is here:
http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/
Can you have a look please?
Thanks,
Paul.
^ permalink raw reply
* "clk: add non CONFIG_HAVE_CLK routines" commit
From: Paul Gortmaker @ 2012-05-22 23:46 UTC (permalink / raw)
To: Viresh Kumar; +Cc: linux-next, Andrew Morton, linux-arm-kernel
Hi Viresh,
The above listed commit, in linux-next as:
commit ebbf0cb5d39cc3e22ef4c425475e76b7f45027de
"clk: add non CONFIG_HAVE_CLK routines"
shows up as failures in the netx_defconfig, since there
are duplicate stub functions between your changes and the
file below:
arch/arm/mach-netx/fb.c:72:6: error: redefinition of 'clk_disable'
include/linux/clk.h:299:51: note: previous definition of 'clk_disable' was here
arch/arm/mach-netx/fb.c:76:5: error: redefinition of 'clk_set_rate'
include/linux/clk.h:306:50: note: previous definition of 'clk_set_rate' was here
arch/arm/mach-netx/fb.c:81:5: error: redefinition of 'clk_enable'
include/linux/clk.h:294:50: note: previous definition of 'clk_enable' was here
arch/arm/mach-netx/fb.c:86:13: error: redefinition of 'clk_get'
include/linux/clk.h:280:58: note: previous definition of 'clk_get' was here
arch/arm/mach-netx/fb.c:91:6: error: redefinition of 'clk_put'
include/linux/clk.h:290:51: note: previous definition of 'clk_put' was here
make[2]: *** [arch/arm/mach-netx/fb.o] Error 1
Can you have a look please, and delete the overlap?
Thanks,
Paul.
^ permalink raw reply
* Re: linux-next: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2012-05-22 22:52 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Lee Jones, Linus Walleij, Mark Brown, linux-next, linux-kernel
In-Reply-To: <20120522224214.GG10210@sortiz-mobl>
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
Hi Samuel,
On Wed, 23 May 2012 00:42:14 +0200 Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> I would appreciate if we could have a fix for this one sooner than later as
> I'm planning to send my pull request by the end of this week.
Just so you know, nothing you have added to your tree since May 11 has
been in linux-next due to 3 separate build problems. As far as I can see
the same will be true today due to the problem you were discussing here.
You quickest way forward may be to either revert commit d28f1db8187d
("mfd: Remove confusing ab8500-i2c file and merge into ab8500-core") (if
possible) or make the building of drivers/mfd/ab8500-core.c depend on
some platform where it is clear it will build.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the watchdog tree with the mfd tree
From: Stephen Rothwell @ 2012-05-22 22:46 UTC (permalink / raw)
To: Guenter Roeck
Cc: Wim Van Sebroeck, linux-next, linux-kernel, Aaron Sierra,
Samuel Ortiz, Randy Dunlap, linux-watchdog, Jean Delvare
In-Reply-To: <6.2.5.6.2.20120522153050.0284ee38@roeck-us.net>
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
Hi guys,
On Tue, 22 May 2012 15:37:04 -0700 Guenter Roeck <guenter@roeck-us.net> wrote:
>
> >I don't think we have a clear standard yet, but I'm fine with either
> >one of them.
>
> Me too, though %04lx and typecast to long should really be sufficient.
>
> I'd guess the change was made because resource_size_t is sometimes a long
> and sometimes a long long, depending on the platform. I hit that
> problem a couple of times myself.
Exactly. Since resource_size_t can be either 32 bit or 64 bit on 32 bit
platforms, you must print it as %llx and cast it to u64 always to
prevent these warnings. If you cast it to (unsigned) long you could
possibly truncate the value.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: bad commit in the cgroup tree
From: Tejun Heo @ 2012-05-22 22:37 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120523083437.e4d3f7ed9b11aae3c51dc2ae@canb.auug.org.au>
Hello, Stephen.
On Tue, May 22, 2012 at 3:34 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> The top commit of the cgroup tree (e4968362bd46 "WIP") should not be in
> linux-next. In fact it looks like you committed your quilt series by
> accident.
>
> I will use the cgroup tree from next-20120522 for today.
Sorry, I apparently executed git commit in the wrong directory. Fixed.
Thank you.
--
tejun
^ permalink raw reply
* Re: linux-next: manual merge of the watchdog tree with the mfd tree
From: Guenter Roeck @ 2012-05-22 22:37 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: Stephen Rothwell, linux-next, linux-kernel, Aaron Sierra,
Samuel Ortiz, Randy Dunlap, linux-watchdog, Jean Delvare
In-Reply-To: <20120522163559.GD3074@spo001.leaseweb.com>
At 09:35 AM 5/22/2012, Wim Van Sebroeck wrote:
>Hi Guenter,
>
> > >> Today's linux-next merge of the watchdog tree got a conflict in
> > >> drivers/watchdog/iTCO_wdt.c between commit 887c8ec7219f ("watchdog:
> > >> Convert iTCO_wdt driver to mfd model") from the tree and commit
> > >> c3614aa19d3e ("watchdog: iTCO_wdt.c: fix printk format warnings") from
> > >> the watchdog tree.
> > >>
> > >> I fixed it up (see below) and can carry the fix as necessary.
> > >
> > >Thanks for fixing this up.
> > >
> > >But I'm a bit surprised: I wasn't Cc'ed about this patch to Convert
> > >the iTCO_wdt driver to the mfd model...
> > Oh my. Kind of embarrassing to forget one of the maintainers in all
> > the discussions which tree this patch set should go through. Even
> > though I didn't much of the code, my sign-off is there, and I should
> > have made sure that you are on the Cc: list. Sorry for that, and I
> > owe you a beer or two if we ever meet in person.
>
>The maintainer and the writer of the driver: that's at least two
>beers indeed :-).
Make it three. Going to be a happy night.
> > Hope you are ok with the changes - the patch set already missed the
> > last commit window because of the which-tree-to-use issue, and it
> > would be sad to miss another one. And Jean is really waiting for it
> > to go in to be able to push some related patches which need the
> gpio driver.
>
>I'm OK with it (although this means I can't go ahead yet with a watchdog core
>conversion of the iTCO_wdt driver), except for the comile warning
>that the patch
>introduces (as reported by Randy).
>
>The original driver printed addresses as %04lx, this new driver uses
>%04llx but
>doesn't typecast the values correctly. See message from Randy below.
>Wether or not %04lx or %04llx is the best to use is off-course
>another question.
>I don't think we have a clear standard yet, but I'm fine with either
>one of them.
Me too, though %04lx and typecast to long should really be sufficient.
I'd guess the change was made because resource_size_t is sometimes a long
and sometimes a long long, depending on the platform. I hit that
problem a couple of times myself.
How do we make sure that Randy's patch makes it upstream ? The iTCO
patch is currently in Sam's tree.
Thanks,
Guenter
>Kind regards,
>Wim.
>---
>Date: Mon, 14 May 2012 13:15:20 -0700
>From: Randy Dunlap <rdunlap@xenotime.net>
>To: Stephen Rothwell <sfr@canb.auug.org.au>
>CC: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
> Wim Van Sebroeck <wim@iguana.be>,
> linux-watchdog@vger.kernel.org
>Subject: [PATCH -next] wdt: fix iTCO printk format warnings
>
>From: Randy Dunlap <rdunlap@xenotime.net>
>
>Fix printk format warnings:
>
>drivers/watchdog/iTCO_wdt.c:577:3: warning: format '%04llx' expects
>type 'long long unsigned int', but argument 2 has type 'resource_size_t'
>drivers/watchdog/iTCO_wdt.c:594:3: warning: format '%04llx' expects
>type 'long long unsigned int', but argument 2 has type 'resource_size_t'
>drivers/watchdog/iTCO_wdt.c:600:2: warning: format '%04llx' expects
>type 'long long unsigned int', but argument 4 has type 'resource_size_t'
>
>Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>Cc: Wim Van Sebroeck <wim@iguana.be>
>---
> drivers/watchdog/iTCO_wdt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>--- linux-next-20120514.orig/drivers/watchdog/iTCO_wdt.c
>+++ linux-next-20120514/drivers/watchdog/iTCO_wdt.c
>@@ -575,7 +575,7 @@ static int __devinit iTCO_wdt_probe(stru
> if (!request_region(iTCO_wdt_private.smi_res->start,
> resource_size(iTCO_wdt_private.smi_res),
> dev->name)) {
> pr_err("I/O address 0x%04llx already in use, device
> disabled\n",
>- SMI_EN);
>+ (u64)SMI_EN);
> ret = -EBUSY;
> goto unmap_gcs;
> }
>@@ -592,13 +592,13 @@ static int __devinit iTCO_wdt_probe(stru
> if (!request_region(iTCO_wdt_private.tco_res->start,
> resource_size(iTCO_wdt_private.tco_res),
> dev->name)) {
> pr_err("I/O address 0x%04llx already in use, device
> disabled\n",
>- TCOBASE);
>+ (u64)TCOBASE);
> ret = -EBUSY;
> goto unreg_smi;
> }
>
> pr_info("Found a %s TCO device (Version=%d, TCOBASE=0x%04llx)\n",
>- ich_info->name, ich_info->iTCO_version, TCOBASE);
>+ ich_info->name, ich_info->iTCO_version, (u64)TCOBASE);
>
> /* Clear out the (probably old) status */
> outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */
^ 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