All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: Tree for Nov 14
@ 2012-11-14  5:30 ` Stephen Rothwell
  0 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  5:30 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel, Linus, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 44483 bytes --]

Hi all,

News: next-20121115 (i.e. tomorrow) will be the last release until
next-20121126 (which should be just be after -rc7, I guess - assuming
that Linus does not release v3.7 before then), so if you want something
in linux-next for a reasonable amount of testing, it should probably be
committed tomorrow.

Changes since 20121113:

The v4l-dvb tree still had its build failure so I used the version from
next-20121026.

The usb tree gained a conflict against usb.current tree.

The staging tree lost its build failure.

The akpm tree lost its build failure.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm 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 210 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  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 (9924a19 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
Merging arm-current/fixes (2b6e204 ARM: 7572/1: proc-v6.S: fix comment)
Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
Merging powerpc-merge/merge (8c23f40 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging sparc/master (b251f0f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (eb5ce43 vxlan: fix a typo.)
Merging sound-current/for-linus (d2153a1 ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins())
Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
Merging wireless/master (6fe7cc7 ath9k: Test for TID only in BlockAcks while checking tx status)
Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
Merging usb.current/usb-linus (e592c5d Revert "USB/host: Cleanup unneccessary irq disable code")
Merging staging.current/staging-linus (d38e0e3 Revert "Staging: Android alarm: IOCTL command encoding fix")
Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
Merging input-current/for-linus (40a8120 Input: MT - document new 'flags' argument of input_mt_init_slots())
Merging md-current/for-linus (ed30be0 MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging rr-fixes/fixes (237242b virtio: Don't access index after unregister.)
Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
Merging arm/for-next (38fa68b Merge remote-tracking branch 'wildea/asids' into for-next)
Merging arm-perf/for-next/perf (ae0c7b2 Merge branch 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (e06f1a9 ARM: zynq: dts: split up device tree)
Merging arm64/upstream (f9db6e1 arm64: mm: update max_dma32 before calculating size of NORMAL zone)
Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
Merging ia64/next (4fafc8c [IA64] Resolve name space collision for cache_show())
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (e561d37 m68k: fix unused variable warning in mempcy.c)
Applying: m68k: fix up for UAPI changes
Merging microblaze/next (f229605 microblaze: dma-mapping: Support debug_dma_mapping_error)
Merging mips/mips-for-linux-next (b4d04a1 Merge branch 'current/for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
Merging s390/features (2423b9d s390/topology: cleanup topology code)
Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
Merging tile/master (ddffeb8 Linux 3.7-rc1)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (d83ac75 xtensa: add xtavnet DTS)
Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
Merging ceph/master (3515297 rbd: activate v2 image support)
Merging cifs/for-next (5004f80 cifs: fix SID binary to string conversion)
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 (e4bc652 eCryptfs: Avoid unnecessary disk read and data decryption during writing)
Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
Merging ext4/dev (989e94e ext4: init pagevec in ext4_da_block_invalidatepages)
Merging fuse/for-next (8888785 fuse: remove unused variable in fuse_try_move_page())
Merging gfs2/master (aa8920c GFS2: Fix one RG corner case)
Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
Merging nfs/linux-next (8ede994 Merge branch 'bugfixes' into linux-next)
Merging nfsd/nfsd-next (7e4f015 nfsd: release the legacy reclaimable clients list in grace_done)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
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 (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
Merging xfs/for-next (ee73259 xfs: add more attribute tree trace points.)
Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
Merging pci/next (7db78a9 Merge branch 'pci/misc' into next)
Merging hid/for-next (f61aaf1 Merge branch 'for-3.8/roccat' into for-next)
Merging i2c/master (3d84243 i2c: Mention functionality flags in SMBus protocol documentation)
Merging i2c-embedded/i2c-embedded/for-next (60f0a25 i2c: tegra: set irq name as device name)
Merging jdelvare-hwmon/master (fe85ffb hwmon: (it87) Support PECI for additional chips)
Merging hwmon-staging/hwmon-next (d29d75d hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
Merging v4l-dvb/master (54db30f Merge /home/v4l/v4l/patchwork)
$ git reset --hard HEAD^
Merging refs/next/20121026/v4l-dvb
Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
Merging acpi/next (90737fc tools/power turbostat: prevent infinite loop on migration error path)
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (160b7d8 Thermal: Remove the cooling_cpufreq_list.)
Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
Merging dlm/next (a3de56b fs/dlm: remove CONFIG_EXPERIMENTAL)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
Merging target-updates/for-next (3735648 target: Update copyright information to 2012)
Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (8007644 async_tx: use memchr_inv)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (910cc72 bnx2x: Add static declaration to several functions)
Merging wireless-next/master (38141fc ar5523: make buffer size variable unsigned)
Merging bluetooth/master (5187464 Bluetooth: Fix updating advertising state flags and data)
Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
Merging l2-mtd/master (33a9d7c mtd: Fix kernel-doc content to avoid warning.)
Merging crypto/master (a465348 crypto: s5p-sss - Fix compilation error)
Merging drm/drm-next (6380813 gma500: medfield: drop bogus NULL check in mdfld_dsi_output_init())
Merging sound/for-next (1762a59 ALSA: usb-audio: Add quirk for Focusrite Scarlett 18i6)
Merging sound-asoc/for-next (064153e Merge branches 'fix/core', 'fix/cs42l52', 'fix/mxs', 'fix/samsung', 'fix/wm8978', 'topic/ak4104', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
Merging modules/modules-next (56713a2 MODSIGN: Add modules_sign make target)
Merging virtio/virtio-next (41395df virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
Merging input/next (544a46c Input: add Retu power button driver.)
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
Merging cgroup/for-next (ef9fe98 cgroup_freezer: implement proper hierarchy support)
Merging block/for-next (95678ef Merge branch 'for-3.8/core' into for-next)
Merging device-mapper/master (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
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 (d5b5205 mmc: sdhci: apply voltage range check only for non-fixed regulators)
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (31841eb Merge branch 'slab/next' into for-next)
CONFLICT (content): Merge conflict in mm/slob.c
Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
Merging md/for-next (79acf8a md:Avoid write invalid address if read_seqretry returned true.)
Merging mfd/for-next (fe39f2f mfd: Implement tps6586x gpio_to_irq)
Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
Merging regulator/for-next (a9829f2 Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/max8925', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
Merging security/next (b566650 drivers/char/tpm: remove tasklet and cleanup)
CONFLICT (content): Merge conflict in security/keys/process_keys.c
CONFLICT (content): Merge conflict in security/keys/keyring.c
CONFLICT (content): Merge conflict in security/keys/keyctl.c
CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (8166ea0 alpha: use BUG_ON where possible)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (ea9c8e2 Merge branch 'acpi-enumeration-next' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
CONFLICT (content): Merge conflict in kernel/audit_tree.c
Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (55020c8 of: Add vendor prefix for ON Semiconductor Corp.)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (19f15f0 Merge branches 'spi-core' and 'spi-tegra' into spi-next)
Merging tip/auto-latest (8a1d31c Merge branch 'x86/urgent')
Merging ftrace/for-next (7bcfaf5 tracing: Add trace_options kernel command line parameter)
Merging rcu/rcu/next (870a511 rcu: Separate accounting of callbacks from callback-free CPUs)
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 kvm/linux-next (f026399 Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue)
Merging kvm-ppc/kvm-ppc-next (f534a53 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte())
CONFLICT (add/add): Merge conflict in arch/powerpc/include/uapi/asm/epapr_hcalls.h
CONFLICT (content): Merge conflict in arch/powerpc/include/uapi/asm/Kbuild
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
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 (9e9b9e6 Merge branch 'stable/for-linus-3.7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
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 (516edb8 Merge remote-tracking branches 'regmap/topic/core', 'regmap/topic/domain', 'regmap/topic/lock', 'regmap/topic/range' and 'regmap/topic/type' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (b11339c leds: lm3642: Fix up world writable sysfs files)
Merging driver-core/driver-core-next (bb3215e Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory.txt)
Merging tty/tty-next (76cc438 tty: of_serial: fix return value check in of_platform_serial_setup())
CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
Merging usb/usb-next (b240add Merge 3.7-rc5 into usb-next)
CONFLICT (content): Merge conflict in drivers/usb/musb/ux500.c
CONFLICT (modify/delete): drivers/usb/host/ohci-xls.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/host/ohci-xls.c left in tree.
CONFLICT (modify/delete): drivers/usb/host/ehci-ls1x.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/host/ehci-ls1x.c left in tree.
CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
$ git rm -f drivers/usb/host/ehci-ls1x.c drivers/usb/host/ohci-xls.c
Merging staging/staging-next (be3c512 staging: comedi: addi_apci_1516: update the MODULE_DESCRIPTION)
CONFLICT (content): Merge conflict in drivers/iio/adc/Makefile
CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig
Merging char-misc/char-misc-next (ab5c4a5 mei: move amthif specific code from mei_write to mei_amthif_write)
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
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 (e38d457 pinctrl: pinmux: Release all taken pins in pinmux_enable_setting error paths)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging gpio-lw/for-next (4b0ce207 Merge branch 'devel' into for-next)
Merging arm-soc/for-next (c9cc10c Merge branch 'next/soc2' into for-next)
CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/at91_ether.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-audio.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/board-nhk8815.c
CONFLICT (modify/delete): arch/arm/configs/stamp9g20_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/stamp9g20_defconfig left in tree.
CONFLICT (modify/delete): arch/arm/configs/afeb9260_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/afeb9260_defconfig left in tree.
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f arch/arm/configs/afeb9260_defconfig arch/arm/configs/stamp9g20_defconfig
Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (adb5641 Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc4'; commit 'ab6f6d85210c4d0265cf48e9958c04e08595055a' into next)
Merging samsung/for-next (a9fe9f0 Merge branch 'next/cleanup-samsung-2' into for-next)
Merging tegra/for-next (8c012a7 Merge branch 'for-3.8/defconfig' into for-next)
Merging kvmtool/master (a6d404d kvm tools: allow arch to specify default virtio transport)
Merging dma-mapping/dma-mapping-next (f75b86d mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls)
Merging pwm/for-next (5bca7cc pwm: spear: Staticize spear_pwm_config())
Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
Merging signal/for-next (fae4535 frv: switch to generic fork/vfork/clone)
CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
Merging clk/clk-next (749a267 clk: ux500: Register nomadik keypad clock lookups for u8500)
Merging random/dev (ec8f02da random: prime last_data value per fips requirements)
Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
Merging drop-experimental/linux-next (2084110 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
Merging scsi-post-merge/merge-base:master ()
Merging akpm-current/current (d715ab1 h8300: add missing L1_CACHE_SHIFT)
$ git checkout akpm
Applying: tmpfs: fix shmem_getpage_gfp VM_BUG_ON
Applying: tmpfs: change final i_blocks BUG to WARNING
Applying: mm: add anon_vma_lock to validate_mm()
Applying: mm: fix build warning for uninitialized value
Applying: memcg: oom: fix totalpages calculation for memory.swappiness==0
Applying: doc: describe memcg swappiness more precisely
Applying: mm: fix a regression with HIGHMEM
Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
Applying: proc: check vma->vm_file before dereferencing
Applying: CRIS: Fix I/O macros
Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
Applying: vfs: d_obtain_alias() needs to use "/" as default name.
Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: arch/x86/tools/insn_sanity.c: identify source of messages
Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
Applying: olpc: fix olpc-xo1-sci.c build errors
Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
Applying: irq: tsk->comm is an array
Applying: irq-tsk-comm-is-an-array-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: fs/pstore/ram.c: fix up section annotations
Applying: h8300: select generic atomic64_t support
Applying: drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift
Applying: tasklet: ignore disabled tasklet in tasklet_action()
Applying: tasklet: ignore disabled tasklet in tasklet_action v2
Applying: drivers/message/fusion/mptscsih.c: missing break
Applying: drivers/scsi/hptiop: support HighPoint RR4520/RR4522 HBA
Applying: vfs: increment iversion when a file is truncated
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: mm/page_alloc.c: remove duplicate check
Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
Applying: mm: show migration types in show_mem
Applying: mm, memcg: make mem_cgroup_out_of_memory() static
Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
Applying: thp: clean up __collapse_huge_page_isolate
Applying: thp-clean-up-__collapse_huge_page_isolate v2
Applying: mm: introduce mm_find_pmd()
Applying: mm-introduce-mm_find_pmd-fix
Applying: thp: introduce hugepage_vma_check()
Applying: thp: cleanup: introduce mk_huge_pmd()
Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
Applying: memory-hotplug: skip HWPoisoned page when offlining pages
Applying: memory-hotplug: update mce_bad_pages when removing the memory
Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
Applying: memory-hotplug: fix NR_FREE_PAGES mismatch's fix
Applying: numa: convert static memory to dynamically allocated memory for per node device
Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
Applying: memory-hotplug: allocate zone's pcp before onlining pages
Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
Applying: mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.
Applying: mm: add comment on storage key dirty bit semantics
Applying: mm,vmscan: only evict file pages when we have plenty
Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
Applying: mm: refactor reinsert of swap_info in sys_swapoff()
Applying: mm: do not call frontswap_init() during swapoff
Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
Applying: mm, highmem: remove useless pool_lock
Applying: mm, highmem: remove page_address_pool list
Applying: mm-highmem-remove-page_address_pool-list-v2
Applying: mm, highmem: makes flush_all_zero_pkmaps() return index of last flushed entry
Applying: mm-highmem-makes-flush_all_zero_pkmaps-return-index-of-last-flushed-entry-v2
Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
Applying: mm: thp: set the accessed flag for old pages on access fault
Applying: mm: memmap_init_zone() performance improvement
Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
Applying: mm, oom: allow exiting threads to have access to memory reserves
Applying: memcg: make it possible to use the stock for more than one page
Applying: memcg: reclaim when more than one page needed
Applying: memcg: change defines to an enum
Applying: memcg: kmem accounting basic infrastructure
Applying: mm: add a __GFP_KMEMCG flag
Applying: memcg: kmem controller infrastructure
Applying: mm: allocate kernel pages to the right memcg
Applying: res_counter: return amount of charges after res_counter_uncharge()
Applying: memcg: kmem accounting lifecycle management
Applying: memcg: use static branches when code not in use
Applying: memcg: allow a memcg with kmem charges to be destructed
Applying: memcg: execute the whole memcg freeing in free_worker()
Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
Applying: memcg: add documentation about the kmem controller
Applying: slab/slub: struct memcg_params
Applying: slab: annotate on-slab caches nodelist locks
Applying: slab/slub: consider a memcg parameter in kmem_create_cache
Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
Applying: memcg: infrastructure to match an allocation to the right cache
Applying: memcg: skip memcg kmem allocations in specified code regions
Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
Applying: sl[au]b: allocate objects from memcg cache
Applying: memcg: destroy memcg caches
Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
Applying: memcg/sl[au]b: shrink dead caches
Applying: memcg: aggregate memcg cache values in slabinfo
Applying: slab: propagate tunable values
Applying: slub: slub-specific propagation changes
Applying: slub-slub-specific-propagation-changes-fix
Applying: kmem: add slab-specific documentation about the kmem controller
Applying: dmapool: make DMAPOOL_DEBUG detect corruption of free marker
Applying: dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix
Applying: mm: hwpoison: fix action_result() to print out dirty/clean
Applying: mm: print out information of file affected by memory error
Applying: mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix
Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix
Applying: selftests: add a test program for variable huge page sizes in mmap/shmget
Applying: mm: augment vma rbtree with rb_subtree_gap
Applying: mm: check rb_subtree_gap correctness
Applying: mm-check-rb_subtree_gap-correctness-fix
Applying: mm: rearrange vm_area_struct for fewer cache misses
Applying: mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes
Applying: mm: vm_unmapped_area() lookup function
Applying: mm-vm_unmapped_area-lookup-function-checkpatch-fixes
Applying: mm: use vm_unmapped_area() on x86_64 architecture
Applying: mm: fix cache coloring on x86_64 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs
Applying: mm: use vm_unmapped_area() in hugetlbfs on i386 architecture
Applying: mm: use vm_unmapped_area() on mips architecture
Applying: mm-use-vm_unmapped_area-on-mips-architecture-fix
Applying: mm: use vm_unmapped_area() on arm architecture
Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix
Applying: mm: use vm_unmapped_area() on sh architecture
Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix
Applying: mm: use vm_unmapped_area() on sparc64 architecture
Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix
Applying: mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
Applying: mm: use vm_unmapped_area() on sparc32 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs on tile architecture
Applying: mm/vmscan.c: try_to_freeze() returns boolean
Applying: mm, mempolicy: remove duplicate code
Applying: mm: adjust address_space_operations.migratepage() return code
Applying: mm-adjust-address_space_operationsmigratepage-return-code-fix
Applying: mm: redefine address_space.assoc_mapping
Applying: mm: introduce a common interface for balloon pages mobility
Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix
Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix
Applying: mm: introduce compaction and migration for ballooned pages
Applying: virtio_balloon: introduce migration primitives to balloon pages
Applying: mm: introduce putback_movable_pages()
Applying: mm: add vm event counters for balloon pages compaction
Applying: mm: fix slab.c kernel-doc warnings
Applying: mm: cleanup register_node()
Applying: mm, oom: change type of oom_score_adj to short
Applying: mm, oom: fix race when specifying a thread as the oom origin
Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page()
Applying: mm: cma: remove watermark hacks
Applying: drop_caches: add some documentation and info message
Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
Applying: mm/memblock: reduce overhead in binary search
Applying: scripts/pnmtologo: fix for plain PBM
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
Applying: scripts/tags.sh: add magic for declarations of popular kernel type
Applying: Documentation: remove reference to feature-removal-schedule.txt
Applying: kernel: remove reference to feature-removal-schedule.txt
Applying: sound: remove reference to feature-removal-schedule.txt
Applying: drivers: remove reference to feature-removal-schedule.txt
Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
Applying: backlight: 88pm860x_bl: fix checkpatch warning
Applying: backlight: atmel-pwm-bl: fix checkpatch warning
Applying: backlight: corgi_lcd: fix checkpatch error and warning
Applying: backlight: da903x_bl: fix checkpatch warning
Applying: backlight: generic_bl: fix checkpatch warning
Applying: backlight: hp680_bl: fix checkpatch error and warning
Applying: backlight: ili9320: fix checkpatch error and warning
Applying: backlight: jornada720: fix checkpatch error and warning
Applying: backlight: l4f00242t03: fix checkpatch warning
Applying: backlight: lm3630: fix checkpatch warning
Applying: backlight: locomolcd: fix checkpatch error and warning
Applying: backlight: omap1: fix checkpatch warning
Applying: backlight: pcf50633: fix checkpatch warning
Applying: backlight: platform_lcd: fix checkpatch error
Applying: backlight: tdo24m: fix checkpatch warning
Applying: backlight: tosa: fix checkpatch error and warning
Applying: backlight: vgg2432a4: fix checkpatch warning
Applying: backlight: lms283gf05: use devm_gpio_request_one
Applying: backlight: tosa: use devm_gpio_request_one
Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
Applying: drivers/video/backlight/da9052_bl.c: add missing const
Applying: drivers/video/backlight/lms283gf05.c: add missing const
Applying: drivers/video/backlight/tdo24m.c: add missing const
Applying: drivers/video/backlight/vgg2432a4.c: add missing const
Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
Applying: string: introduce helper to get base file name from given path
Applying: lib: dynamic_debug: use kbasename()
Applying: mm: use kbasename()
Applying: procfs: use kbasename()
Applying: proc_devtree: remove duplicated include from proc_devtree.c
Applying: trace: use kbasename()
Applying: drivers/of/fdt.c: re-use kernel's kbasename()
Applying: sscanf: don't ignore field widths for numeric conversions
Applying: percpu_rw_semaphore: reimplement to not block the readers unnecessarily
Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
Applying: checkpatch: warn on unnecessary line continuations
Applying: epoll: support for disabling items, and a self-test app
Applying: binfmt_elf: fix corner case kfree of uninitialized data
Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
Applying: rtc: omap: kicker mechanism support
Applying: ARM: davinci: remove rtc kicker release
Applying: rtc: omap: dt support
Applying: rtc: omap: depend on am33xx
Applying: rtc: omap: add runtime pm support
Applying: drivers/rtc/rtc-imxdi: support for i.MX53
Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
Applying: drivers/rtc/rtc-test.c: avoid calling platform_device_put() twice
Applying: rtc-avoid-calling-platform_device_put-twice-in-test_init-fix
Applying: rtc: rtc-spear: use devm_*() routines
Applying: rtc: rtc-spear: Add clk_{un}prepare() support
Applying: rtc: rtc-spear: Provide flag for no support of UIE mode
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
Applying: hfsplus: code style fixes - reworked support of extended attributes
Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
Applying: Documentation: fix Documentation/security/00-INDEX
Applying: kstrto*: add documentation
Applying: simple_strto*: annotate function as obsolete
Applying: proc: don't show nonexistent capabilities
Applying: procfs: add VmFlags field in smaps output
Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
Applying: /proc/pid/status: add "Seccomp" field
Applying: fork: unshare: remove dead code
Applying: ipc: remove forced assignment of selected message
Applying: ipc: add sysctl to specify desired next object id
Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
Applying: Documentation: update sysctl/kernel.txt
Applying: ipc: message queue receive cleanup
Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
Applying: ipc: introduce message queue copy feature
Applying: ipc: remove redundant MSG_COPY check
Applying: ipc: cleanup do_msgrcv() around MSG_COPY feature
Applying: selftests: IPC message queue copy feature test
Applying: test: IPC message queue copy feature test update
Applying: ipc: simplify free_copy() call
Applying: ipc: convert prepare_copy() from macro to function
Applying: ipc-convert-prepare_copy-from-macro-to-function-fix
Applying: ipc: simplify message copying
Applying: ipc: add more comments to message copying related code
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix
Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
Applying: Documentation/sparse.txt: document context annotations for lock checking
Applying: aoe: describe the behavior of the "err" character device
Applying: aoe: print warning regarding a common reason for dropped transmits
Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
Applying: aoe: avoid using skb member after dev_queue_xmit
Applying: aoe: update cap on outstanding commands based on config query response
Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
Applying: aoe: support larger I/O requests via aoe_maxsectors module param
Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
Applying: aoe: cleanup: remove unused ata_scnt function
Applying: aoe: whitespace cleanup
Applying: aoe: update driver-internal version number to 60
Applying: aoe: provide ATA identify device content to user on request
Applying: aoe: improve network congestion handling
Applying: aoe: err device: include MAC addresses for unexpected responses
Applying: aoe: manipulate aoedev network stats under lock
Applying: aoe: use high-resolution RTTs with fallback to low-res
Applying: aoe: commands in retransmit queue use new destination on failure
Applying: aoe: update driver-internal version to 64+
Applying: Documentation/DMA-API-HOWTO.txt: fix typo
Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
Applying: fix mm: augment vma rbtree with rb_subtree_gap
Applying: fix mm: use vm_unmapped_area() in hugetlbfs on tile architecture
Applying: fix mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix2
Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix2
Applying: mm: fix for use vm_unmapped_area() in hugetlbfs on i386 architecture
Applying: fix mm: use vm_unmapped_area() on sparc32 architecture
Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix
Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix fix
Merging akpm/master (b7c0f57 MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix fix)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* linux-next: Tree for Nov 14
@ 2012-11-14  5:30 ` Stephen Rothwell
  0 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  5:30 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel, Linus, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 44483 bytes --]

Hi all,

News: next-20121115 (i.e. tomorrow) will be the last release until
next-20121126 (which should be just be after -rc7, I guess - assuming
that Linus does not release v3.7 before then), so if you want something
in linux-next for a reasonable amount of testing, it should probably be
committed tomorrow.

Changes since 20121113:

The v4l-dvb tree still had its build failure so I used the version from
next-20121026.

The usb tree gained a conflict against usb.current tree.

The staging tree lost its build failure.

The akpm tree lost its build failure.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm 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 210 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  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 (9924a19 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
Merging arm-current/fixes (2b6e204 ARM: 7572/1: proc-v6.S: fix comment)
Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
Merging powerpc-merge/merge (8c23f40 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging sparc/master (b251f0f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (eb5ce43 vxlan: fix a typo.)
Merging sound-current/for-linus (d2153a1 ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins())
Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
Merging wireless/master (6fe7cc7 ath9k: Test for TID only in BlockAcks while checking tx status)
Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
Merging usb.current/usb-linus (e592c5d Revert "USB/host: Cleanup unneccessary irq disable code")
Merging staging.current/staging-linus (d38e0e3 Revert "Staging: Android alarm: IOCTL command encoding fix")
Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
Merging input-current/for-linus (40a8120 Input: MT - document new 'flags' argument of input_mt_init_slots())
Merging md-current/for-linus (ed30be0 MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging rr-fixes/fixes (237242b virtio: Don't access index after unregister.)
Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
Merging arm/for-next (38fa68b Merge remote-tracking branch 'wildea/asids' into for-next)
Merging arm-perf/for-next/perf (ae0c7b2 Merge branch 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (e06f1a9 ARM: zynq: dts: split up device tree)
Merging arm64/upstream (f9db6e1 arm64: mm: update max_dma32 before calculating size of NORMAL zone)
Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
Merging ia64/next (4fafc8c [IA64] Resolve name space collision for cache_show())
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (e561d37 m68k: fix unused variable warning in mempcy.c)
Applying: m68k: fix up for UAPI changes
Merging microblaze/next (f229605 microblaze: dma-mapping: Support debug_dma_mapping_error)
Merging mips/mips-for-linux-next (b4d04a1 Merge branch 'current/for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
Merging s390/features (2423b9d s390/topology: cleanup topology code)
Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
Merging tile/master (ddffeb8 Linux 3.7-rc1)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (d83ac75 xtensa: add xtavnet DTS)
Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
Merging ceph/master (3515297 rbd: activate v2 image support)
Merging cifs/for-next (5004f80 cifs: fix SID binary to string conversion)
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 (e4bc652 eCryptfs: Avoid unnecessary disk read and data decryption during writing)
Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
Merging ext4/dev (989e94e ext4: init pagevec in ext4_da_block_invalidatepages)
Merging fuse/for-next (8888785 fuse: remove unused variable in fuse_try_move_page())
Merging gfs2/master (aa8920c GFS2: Fix one RG corner case)
Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
Merging nfs/linux-next (8ede994 Merge branch 'bugfixes' into linux-next)
Merging nfsd/nfsd-next (7e4f015 nfsd: release the legacy reclaimable clients list in grace_done)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
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 (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
Merging xfs/for-next (ee73259 xfs: add more attribute tree trace points.)
Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
Merging pci/next (7db78a9 Merge branch 'pci/misc' into next)
Merging hid/for-next (f61aaf1 Merge branch 'for-3.8/roccat' into for-next)
Merging i2c/master (3d84243 i2c: Mention functionality flags in SMBus protocol documentation)
Merging i2c-embedded/i2c-embedded/for-next (60f0a25 i2c: tegra: set irq name as device name)
Merging jdelvare-hwmon/master (fe85ffb hwmon: (it87) Support PECI for additional chips)
Merging hwmon-staging/hwmon-next (d29d75d hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
Merging v4l-dvb/master (54db30f Merge /home/v4l/v4l/patchwork)
$ git reset --hard HEAD^
Merging refs/next/20121026/v4l-dvb
Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
Merging acpi/next (90737fc tools/power turbostat: prevent infinite loop on migration error path)
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (160b7d8 Thermal: Remove the cooling_cpufreq_list.)
Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
Merging dlm/next (a3de56b fs/dlm: remove CONFIG_EXPERIMENTAL)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
Merging target-updates/for-next (3735648 target: Update copyright information to 2012)
Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (8007644 async_tx: use memchr_inv)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (910cc72 bnx2x: Add static declaration to several functions)
Merging wireless-next/master (38141fc ar5523: make buffer size variable unsigned)
Merging bluetooth/master (5187464 Bluetooth: Fix updating advertising state flags and data)
Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
Merging l2-mtd/master (33a9d7c mtd: Fix kernel-doc content to avoid warning.)
Merging crypto/master (a465348 crypto: s5p-sss - Fix compilation error)
Merging drm/drm-next (6380813 gma500: medfield: drop bogus NULL check in mdfld_dsi_output_init())
Merging sound/for-next (1762a59 ALSA: usb-audio: Add quirk for Focusrite Scarlett 18i6)
Merging sound-asoc/for-next (064153e Merge branches 'fix/core', 'fix/cs42l52', 'fix/mxs', 'fix/samsung', 'fix/wm8978', 'topic/ak4104', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
Merging modules/modules-next (56713a2 MODSIGN: Add modules_sign make target)
Merging virtio/virtio-next (41395df virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
Merging input/next (544a46c Input: add Retu power button driver.)
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
Merging cgroup/for-next (ef9fe98 cgroup_freezer: implement proper hierarchy support)
Merging block/for-next (95678ef Merge branch 'for-3.8/core' into for-next)
Merging device-mapper/master (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
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 (d5b5205 mmc: sdhci: apply voltage range check only for non-fixed regulators)
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (31841eb Merge branch 'slab/next' into for-next)
CONFLICT (content): Merge conflict in mm/slob.c
Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
Merging md/for-next (79acf8a md:Avoid write invalid address if read_seqretry returned true.)
Merging mfd/for-next (fe39f2f mfd: Implement tps6586x gpio_to_irq)
Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
Merging regulator/for-next (a9829f2 Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/max8925', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
Merging security/next (b566650 drivers/char/tpm: remove tasklet and cleanup)
CONFLICT (content): Merge conflict in security/keys/process_keys.c
CONFLICT (content): Merge conflict in security/keys/keyring.c
CONFLICT (content): Merge conflict in security/keys/keyctl.c
CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (8166ea0 alpha: use BUG_ON where possible)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (ea9c8e2 Merge branch 'acpi-enumeration-next' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
CONFLICT (content): Merge conflict in kernel/audit_tree.c
Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (55020c8 of: Add vendor prefix for ON Semiconductor Corp.)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (19f15f0 Merge branches 'spi-core' and 'spi-tegra' into spi-next)
Merging tip/auto-latest (8a1d31c Merge branch 'x86/urgent')
Merging ftrace/for-next (7bcfaf5 tracing: Add trace_options kernel command line parameter)
Merging rcu/rcu/next (870a511 rcu: Separate accounting of callbacks from callback-free CPUs)
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 kvm/linux-next (f026399 Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue)
Merging kvm-ppc/kvm-ppc-next (f534a53 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte())
CONFLICT (add/add): Merge conflict in arch/powerpc/include/uapi/asm/epapr_hcalls.h
CONFLICT (content): Merge conflict in arch/powerpc/include/uapi/asm/Kbuild
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
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 (9e9b9e6 Merge branch 'stable/for-linus-3.7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
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 (516edb8 Merge remote-tracking branches 'regmap/topic/core', 'regmap/topic/domain', 'regmap/topic/lock', 'regmap/topic/range' and 'regmap/topic/type' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (b11339c leds: lm3642: Fix up world writable sysfs files)
Merging driver-core/driver-core-next (bb3215e Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory.txt)
Merging tty/tty-next (76cc438 tty: of_serial: fix return value check in of_platform_serial_setup())
CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
Merging usb/usb-next (b240add Merge 3.7-rc5 into usb-next)
CONFLICT (content): Merge conflict in drivers/usb/musb/ux500.c
CONFLICT (modify/delete): drivers/usb/host/ohci-xls.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/host/ohci-xls.c left in tree.
CONFLICT (modify/delete): drivers/usb/host/ehci-ls1x.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/host/ehci-ls1x.c left in tree.
CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
$ git rm -f drivers/usb/host/ehci-ls1x.c drivers/usb/host/ohci-xls.c
Merging staging/staging-next (be3c512 staging: comedi: addi_apci_1516: update the MODULE_DESCRIPTION)
CONFLICT (content): Merge conflict in drivers/iio/adc/Makefile
CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig
Merging char-misc/char-misc-next (ab5c4a5 mei: move amthif specific code from mei_write to mei_amthif_write)
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
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 (e38d457 pinctrl: pinmux: Release all taken pins in pinmux_enable_setting error paths)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging gpio-lw/for-next (4b0ce207 Merge branch 'devel' into for-next)
Merging arm-soc/for-next (c9cc10c Merge branch 'next/soc2' into for-next)
CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/at91_ether.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-audio.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/board-nhk8815.c
CONFLICT (modify/delete): arch/arm/configs/stamp9g20_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/stamp9g20_defconfig left in tree.
CONFLICT (modify/delete): arch/arm/configs/afeb9260_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/afeb9260_defconfig left in tree.
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f arch/arm/configs/afeb9260_defconfig arch/arm/configs/stamp9g20_defconfig
Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (adb5641 Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc4'; commit 'ab6f6d85210c4d0265cf48e9958c04e08595055a' into next)
Merging samsung/for-next (a9fe9f0 Merge branch 'next/cleanup-samsung-2' into for-next)
Merging tegra/for-next (8c012a7 Merge branch 'for-3.8/defconfig' into for-next)
Merging kvmtool/master (a6d404d kvm tools: allow arch to specify default virtio transport)
Merging dma-mapping/dma-mapping-next (f75b86d mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls)
Merging pwm/for-next (5bca7cc pwm: spear: Staticize spear_pwm_config())
Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
Merging signal/for-next (fae4535 frv: switch to generic fork/vfork/clone)
CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
Merging clk/clk-next (749a267 clk: ux500: Register nomadik keypad clock lookups for u8500)
Merging random/dev (ec8f02da random: prime last_data value per fips requirements)
Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
Merging drop-experimental/linux-next (2084110 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
Merging scsi-post-merge/merge-base:master ()
Merging akpm-current/current (d715ab1 h8300: add missing L1_CACHE_SHIFT)
$ git checkout akpm
Applying: tmpfs: fix shmem_getpage_gfp VM_BUG_ON
Applying: tmpfs: change final i_blocks BUG to WARNING
Applying: mm: add anon_vma_lock to validate_mm()
Applying: mm: fix build warning for uninitialized value
Applying: memcg: oom: fix totalpages calculation for memory.swappiness==0
Applying: doc: describe memcg swappiness more precisely
Applying: mm: fix a regression with HIGHMEM
Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
Applying: proc: check vma->vm_file before dereferencing
Applying: CRIS: Fix I/O macros
Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
Applying: vfs: d_obtain_alias() needs to use "/" as default name.
Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: arch/x86/tools/insn_sanity.c: identify source of messages
Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
Applying: olpc: fix olpc-xo1-sci.c build errors
Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
Applying: irq: tsk->comm is an array
Applying: irq-tsk-comm-is-an-array-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: fs/pstore/ram.c: fix up section annotations
Applying: h8300: select generic atomic64_t support
Applying: drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift
Applying: tasklet: ignore disabled tasklet in tasklet_action()
Applying: tasklet: ignore disabled tasklet in tasklet_action v2
Applying: drivers/message/fusion/mptscsih.c: missing break
Applying: drivers/scsi/hptiop: support HighPoint RR4520/RR4522 HBA
Applying: vfs: increment iversion when a file is truncated
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: mm/page_alloc.c: remove duplicate check
Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
Applying: mm: show migration types in show_mem
Applying: mm, memcg: make mem_cgroup_out_of_memory() static
Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
Applying: thp: clean up __collapse_huge_page_isolate
Applying: thp-clean-up-__collapse_huge_page_isolate v2
Applying: mm: introduce mm_find_pmd()
Applying: mm-introduce-mm_find_pmd-fix
Applying: thp: introduce hugepage_vma_check()
Applying: thp: cleanup: introduce mk_huge_pmd()
Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
Applying: memory-hotplug: skip HWPoisoned page when offlining pages
Applying: memory-hotplug: update mce_bad_pages when removing the memory
Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
Applying: memory-hotplug: fix NR_FREE_PAGES mismatch's fix
Applying: numa: convert static memory to dynamically allocated memory for per node device
Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
Applying: memory-hotplug: allocate zone's pcp before onlining pages
Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
Applying: mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.
Applying: mm: add comment on storage key dirty bit semantics
Applying: mm,vmscan: only evict file pages when we have plenty
Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
Applying: mm: refactor reinsert of swap_info in sys_swapoff()
Applying: mm: do not call frontswap_init() during swapoff
Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
Applying: mm, highmem: remove useless pool_lock
Applying: mm, highmem: remove page_address_pool list
Applying: mm-highmem-remove-page_address_pool-list-v2
Applying: mm, highmem: makes flush_all_zero_pkmaps() return index of last flushed entry
Applying: mm-highmem-makes-flush_all_zero_pkmaps-return-index-of-last-flushed-entry-v2
Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
Applying: mm: thp: set the accessed flag for old pages on access fault
Applying: mm: memmap_init_zone() performance improvement
Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
Applying: mm, oom: allow exiting threads to have access to memory reserves
Applying: memcg: make it possible to use the stock for more than one page
Applying: memcg: reclaim when more than one page needed
Applying: memcg: change defines to an enum
Applying: memcg: kmem accounting basic infrastructure
Applying: mm: add a __GFP_KMEMCG flag
Applying: memcg: kmem controller infrastructure
Applying: mm: allocate kernel pages to the right memcg
Applying: res_counter: return amount of charges after res_counter_uncharge()
Applying: memcg: kmem accounting lifecycle management
Applying: memcg: use static branches when code not in use
Applying: memcg: allow a memcg with kmem charges to be destructed
Applying: memcg: execute the whole memcg freeing in free_worker()
Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
Applying: memcg: add documentation about the kmem controller
Applying: slab/slub: struct memcg_params
Applying: slab: annotate on-slab caches nodelist locks
Applying: slab/slub: consider a memcg parameter in kmem_create_cache
Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
Applying: memcg: infrastructure to match an allocation to the right cache
Applying: memcg: skip memcg kmem allocations in specified code regions
Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
Applying: sl[au]b: allocate objects from memcg cache
Applying: memcg: destroy memcg caches
Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
Applying: memcg/sl[au]b: shrink dead caches
Applying: memcg: aggregate memcg cache values in slabinfo
Applying: slab: propagate tunable values
Applying: slub: slub-specific propagation changes
Applying: slub-slub-specific-propagation-changes-fix
Applying: kmem: add slab-specific documentation about the kmem controller
Applying: dmapool: make DMAPOOL_DEBUG detect corruption of free marker
Applying: dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix
Applying: mm: hwpoison: fix action_result() to print out dirty/clean
Applying: mm: print out information of file affected by memory error
Applying: mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix
Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix
Applying: selftests: add a test program for variable huge page sizes in mmap/shmget
Applying: mm: augment vma rbtree with rb_subtree_gap
Applying: mm: check rb_subtree_gap correctness
Applying: mm-check-rb_subtree_gap-correctness-fix
Applying: mm: rearrange vm_area_struct for fewer cache misses
Applying: mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes
Applying: mm: vm_unmapped_area() lookup function
Applying: mm-vm_unmapped_area-lookup-function-checkpatch-fixes
Applying: mm: use vm_unmapped_area() on x86_64 architecture
Applying: mm: fix cache coloring on x86_64 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs
Applying: mm: use vm_unmapped_area() in hugetlbfs on i386 architecture
Applying: mm: use vm_unmapped_area() on mips architecture
Applying: mm-use-vm_unmapped_area-on-mips-architecture-fix
Applying: mm: use vm_unmapped_area() on arm architecture
Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix
Applying: mm: use vm_unmapped_area() on sh architecture
Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix
Applying: mm: use vm_unmapped_area() on sparc64 architecture
Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix
Applying: mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
Applying: mm: use vm_unmapped_area() on sparc32 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs on tile architecture
Applying: mm/vmscan.c: try_to_freeze() returns boolean
Applying: mm, mempolicy: remove duplicate code
Applying: mm: adjust address_space_operations.migratepage() return code
Applying: mm-adjust-address_space_operationsmigratepage-return-code-fix
Applying: mm: redefine address_space.assoc_mapping
Applying: mm: introduce a common interface for balloon pages mobility
Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix
Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix
Applying: mm: introduce compaction and migration for ballooned pages
Applying: virtio_balloon: introduce migration primitives to balloon pages
Applying: mm: introduce putback_movable_pages()
Applying: mm: add vm event counters for balloon pages compaction
Applying: mm: fix slab.c kernel-doc warnings
Applying: mm: cleanup register_node()
Applying: mm, oom: change type of oom_score_adj to short
Applying: mm, oom: fix race when specifying a thread as the oom origin
Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page()
Applying: mm: cma: remove watermark hacks
Applying: drop_caches: add some documentation and info message
Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
Applying: mm/memblock: reduce overhead in binary search
Applying: scripts/pnmtologo: fix for plain PBM
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
Applying: scripts/tags.sh: add magic for declarations of popular kernel type
Applying: Documentation: remove reference to feature-removal-schedule.txt
Applying: kernel: remove reference to feature-removal-schedule.txt
Applying: sound: remove reference to feature-removal-schedule.txt
Applying: drivers: remove reference to feature-removal-schedule.txt
Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
Applying: backlight: 88pm860x_bl: fix checkpatch warning
Applying: backlight: atmel-pwm-bl: fix checkpatch warning
Applying: backlight: corgi_lcd: fix checkpatch error and warning
Applying: backlight: da903x_bl: fix checkpatch warning
Applying: backlight: generic_bl: fix checkpatch warning
Applying: backlight: hp680_bl: fix checkpatch error and warning
Applying: backlight: ili9320: fix checkpatch error and warning
Applying: backlight: jornada720: fix checkpatch error and warning
Applying: backlight: l4f00242t03: fix checkpatch warning
Applying: backlight: lm3630: fix checkpatch warning
Applying: backlight: locomolcd: fix checkpatch error and warning
Applying: backlight: omap1: fix checkpatch warning
Applying: backlight: pcf50633: fix checkpatch warning
Applying: backlight: platform_lcd: fix checkpatch error
Applying: backlight: tdo24m: fix checkpatch warning
Applying: backlight: tosa: fix checkpatch error and warning
Applying: backlight: vgg2432a4: fix checkpatch warning
Applying: backlight: lms283gf05: use devm_gpio_request_one
Applying: backlight: tosa: use devm_gpio_request_one
Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
Applying: drivers/video/backlight/da9052_bl.c: add missing const
Applying: drivers/video/backlight/lms283gf05.c: add missing const
Applying: drivers/video/backlight/tdo24m.c: add missing const
Applying: drivers/video/backlight/vgg2432a4.c: add missing const
Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
Applying: string: introduce helper to get base file name from given path
Applying: lib: dynamic_debug: use kbasename()
Applying: mm: use kbasename()
Applying: procfs: use kbasename()
Applying: proc_devtree: remove duplicated include from proc_devtree.c
Applying: trace: use kbasename()
Applying: drivers/of/fdt.c: re-use kernel's kbasename()
Applying: sscanf: don't ignore field widths for numeric conversions
Applying: percpu_rw_semaphore: reimplement to not block the readers unnecessarily
Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
Applying: checkpatch: warn on unnecessary line continuations
Applying: epoll: support for disabling items, and a self-test app
Applying: binfmt_elf: fix corner case kfree of uninitialized data
Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
Applying: rtc: omap: kicker mechanism support
Applying: ARM: davinci: remove rtc kicker release
Applying: rtc: omap: dt support
Applying: rtc: omap: depend on am33xx
Applying: rtc: omap: add runtime pm support
Applying: drivers/rtc/rtc-imxdi: support for i.MX53
Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
Applying: drivers/rtc/rtc-test.c: avoid calling platform_device_put() twice
Applying: rtc-avoid-calling-platform_device_put-twice-in-test_init-fix
Applying: rtc: rtc-spear: use devm_*() routines
Applying: rtc: rtc-spear: Add clk_{un}prepare() support
Applying: rtc: rtc-spear: Provide flag for no support of UIE mode
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
Applying: hfsplus: code style fixes - reworked support of extended attributes
Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
Applying: Documentation: fix Documentation/security/00-INDEX
Applying: kstrto*: add documentation
Applying: simple_strto*: annotate function as obsolete
Applying: proc: don't show nonexistent capabilities
Applying: procfs: add VmFlags field in smaps output
Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
Applying: /proc/pid/status: add "Seccomp" field
Applying: fork: unshare: remove dead code
Applying: ipc: remove forced assignment of selected message
Applying: ipc: add sysctl to specify desired next object id
Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
Applying: Documentation: update sysctl/kernel.txt
Applying: ipc: message queue receive cleanup
Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
Applying: ipc: introduce message queue copy feature
Applying: ipc: remove redundant MSG_COPY check
Applying: ipc: cleanup do_msgrcv() around MSG_COPY feature
Applying: selftests: IPC message queue copy feature test
Applying: test: IPC message queue copy feature test update
Applying: ipc: simplify free_copy() call
Applying: ipc: convert prepare_copy() from macro to function
Applying: ipc-convert-prepare_copy-from-macro-to-function-fix
Applying: ipc: simplify message copying
Applying: ipc: add more comments to message copying related code
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix
Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
Applying: Documentation/sparse.txt: document context annotations for lock checking
Applying: aoe: describe the behavior of the "err" character device
Applying: aoe: print warning regarding a common reason for dropped transmits
Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
Applying: aoe: avoid using skb member after dev_queue_xmit
Applying: aoe: update cap on outstanding commands based on config query response
Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
Applying: aoe: support larger I/O requests via aoe_maxsectors module param
Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
Applying: aoe: cleanup: remove unused ata_scnt function
Applying: aoe: whitespace cleanup
Applying: aoe: update driver-internal version number to 60
Applying: aoe: provide ATA identify device content to user on request
Applying: aoe: improve network congestion handling
Applying: aoe: err device: include MAC addresses for unexpected responses
Applying: aoe: manipulate aoedev network stats under lock
Applying: aoe: use high-resolution RTTs with fallback to low-res
Applying: aoe: commands in retransmit queue use new destination on failure
Applying: aoe: update driver-internal version to 64+
Applying: Documentation/DMA-API-HOWTO.txt: fix typo
Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
Applying: fix mm: augment vma rbtree with rb_subtree_gap
Applying: fix mm: use vm_unmapped_area() in hugetlbfs on tile architecture
Applying: fix mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix2
Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix2
Applying: mm: fix for use vm_unmapped_area() in hugetlbfs on i386 architecture
Applying: fix mm: use vm_unmapped_area() on sparc32 architecture
Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix
Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix fix
Merging akpm/master (b7c0f57 MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix fix)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  5:30 ` Stephen Rothwell
@ 2012-11-14  5:37   ` Andrew Morton
  -1 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  5:37 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> News: next-20121115 (i.e. tomorrow) will be the last release until
> next-20121126 (which should be just be after -rc7, I guess - assuming
> that Linus does not release v3.7 before then), so if you want something
> in linux-next for a reasonable amount of testing, it should probably be
> committed tomorrow.

It would help if the old sched/numa code wasn't in -next while you're
away.  That would give me a clean run at 3.7 and will make it easier
for others to integrate and test the four(!) different
autoschednumacore implementations on top of linux-next.

Pretty please?

Also, I need to get a fresh mmotm into -next tomorrow.  Don't do
anything until I've pulled that rabbit out of the hat :)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
@ 2012-11-14  5:37   ` Andrew Morton
  0 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  5:37 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> News: next-20121115 (i.e. tomorrow) will be the last release until
> next-20121126 (which should be just be after -rc7, I guess - assuming
> that Linus does not release v3.7 before then), so if you want something
> in linux-next for a reasonable amount of testing, it should probably be
> committed tomorrow.

It would help if the old sched/numa code wasn't in -next while you're
away.  That would give me a clean run at 3.7 and will make it easier
for others to integrate and test the four(!) different
autoschednumacore implementations on top of linux-next.

Pretty please?

Also, I need to get a fresh mmotm into -next tomorrow.  Don't do
anything until I've pulled that rabbit out of the hat :)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  5:37   ` Andrew Morton
@ 2012-11-14  5:53     ` Andrew Morton
  -1 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  5:53 UTC (permalink / raw)
  To: Stephen Rothwell, linux-next, linux-kernel, Linus, Ingo Molnar,
	Hugh Dickins

On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:

> It would help if the old sched/numa code wasn't in -next while you're
> away.

Now I think about it, that's going to be hard.  If I integrate against
tomorrow's -next, the mmotm patches will be against next+schednuma. 
Then you'll need to unintegrate them - effectively redo them against
mainline.

That won't be toooo hard, but there are some tricky bits.  Is there a way
I can extract a schednuma-free -next tomorrow?  That way I can do the wrangling.

This thing really has been a pain ;(  I've been uncharacteristically
patient!

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
@ 2012-11-14  5:53     ` Andrew Morton
  0 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  5:53 UTC (permalink / raw)
  To: Stephen Rothwell, linux-next, linux-kernel, Linus, Ingo Molnar,
	Hugh Dickins

On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:

> It would help if the old sched/numa code wasn't in -next while you're
> away.

Now I think about it, that's going to be hard.  If I integrate against
tomorrow's -next, the mmotm patches will be against next+schednuma. 
Then you'll need to unintegrate them - effectively redo them against
mainline.

That won't be toooo hard, but there are some tricky bits.  Is there a way
I can extract a schednuma-free -next tomorrow?  That way I can do the wrangling.

This thing really has been a pain ;(  I've been uncharacteristically
patient!

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  5:37   ` Andrew Morton
  (?)
  (?)
@ 2012-11-14  6:47   ` Ingo Molnar
  2012-11-14  6:56     ` Andrew Morton
  -1 siblings, 1 reply; 31+ messages in thread
From: Ingo Molnar @ 2012-11-14  6:47 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Stephen Rothwell, linux-next, linux-kernel, Linus, Ingo Molnar,
	Hugh Dickins


* Andrew Morton <akpm@linux-foundation.org> wrote:

> On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > News: next-20121115 (i.e. tomorrow) will be the last release until
> > next-20121126 (which should be just be after -rc7, I guess - assuming
> > that Linus does not release v3.7 before then), so if you want something
> > in linux-next for a reasonable amount of testing, it should probably be
> > committed tomorrow.
> 
> It would help if the old sched/numa code wasn't in -next while 
> you're away.  That would give me a clean run at 3.7 and will 
> make it easier for others to integrate and test the four(!) 
> different autoschednumacore implementations on top of 
> linux-next.
> 
> Pretty please?

The next integration should have this solved: I have removed the 
old sched/numa bits, replaced by the latest rebased/reworked 
numa/core bits.

(There's no fundamental changes to the mm/ bits, so the 
conflict/merge fall-out should be minimal and/or trivial.)

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  5:37   ` Andrew Morton
@ 2012-11-14  6:55     ` Stephen Rothwell
  -1 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  6:55 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

[-- Attachment #1: Type: text/plain, Size: 4999 bytes --]

Hi Andrew,

On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> It would help if the old sched/numa code wasn't in -next while you're
> away.  That would give me a clean run at 3.7 and will make it easier
> for others to integrate and test the four(!) different
> autoschednumacore implementations on top of linux-next.
> 
> Pretty please?

So, your understanding is that the "old sched/numa code" won't (and
shouldn't) be merged into Linus' tree (for v3.7, or ever)?

In that case, what I can do is give you a tree that is the same as
akpm-base but with one of the merges in the tip tree reverted (and, in
fact, I could push that into akpm-base to make things easier for you).
I guess that would be the merge of the numa/core branch which would
result in the following commits being reverted:

Andrea Arcangeli (1):
      numa, mm: Support NUMA hinting page faults from gup/gup_fast

Gerald Schaefer (1):
      sched, numa, mm, s390/thp: Implement pmd_pgprot() for s390

Ingo Molnar (2):
      mm/pgprot: Move the pgprot_modify() fallback definition to mm.h
      sched, numa, mm: Add NUMA_MIGRATION feature flag

Lee Schermerhorn (3):
      mm/mpol: Add MPOL_MF_NOOP
      mm/mpol: Check for misplaced page
      mm/mpol: Add MPOL_MF_LAZY

Peter Zijlstra (17):
      sched, numa, mm: Make find_busiest_queue() a method
      sched, numa, mm: Describe the NUMA scheduling problem formally
      mm/thp: Preserve pgprot across huge page split
      mm/mpol: Make MPOL_LOCAL a real policy
      mm/mpol: Create special PROT_NONE infrastructure
      mm/migrate: Introduce migrate_misplaced_page()
      mm/mpol: Use special PROT_NONE to migrate pages
      sched, numa, mm: Introduce tsk_home_node()
      sched, numa, mm/mpol: Make mempolicy home-node aware
      sched, numa, mm: Introduce sched_feat_numa()
      sched, numa, mm: Implement THP migration
      sched, numa, mm: Implement home-node awareness
      sched, numa, mm: Introduce last_nid in the pageframe
      sched, numa, mm/mpol: Add_MPOL_F_HOME
      sched, numa, mm: Add fault driven placement and migration policy
      sched, numa, mm: Implement constant, per task Working Set Sampling (WSS) rate
      sched, numa, mm: Implement slow start for working set sampling

Ralf Baechle (1):
      sched, numa, mm, MIPS/thp: Add pmd_pgprot() implementation

Rik van Riel (6):
      mm/generic: Only flush the local TLB in ptep_set_access_flags()
      x86/mm: Only do a local tlb flush in ptep_set_access_flags()
      x86/mm: Introduce pte_accessible()
      mm: Only flush the TLB when clearing an accessible pte
      sched, numa, mm: Add credits for NUMA placement
      x86/mm: Completely drop the TLB flush from ptep_set_access_flags()

 CREDITS                                  |    1 -
 Documentation/scheduler/numa-problem.txt |  230 ------------
 arch/mips/include/asm/pgtable.h          |    2 -
 arch/s390/include/asm/pgtable.h          |   13 -
 arch/sh/mm/Kconfig                       |    1 -
 arch/x86/include/asm/pgtable.h           |    7 -
 arch/x86/mm/pgtable.c                    |    8 +-
 include/asm-generic/pgtable.h            |    4 -
 include/linux/huge_mm.h                  |   19 -
 include/linux/init_task.h                |    8 -
 include/linux/mempolicy.h                |    8 -
 include/linux/migrate.h                  |    7 -
 include/linux/migrate_mode.h             |    3 -
 include/linux/mm.h                       |  122 +++----
 include/linux/mm_types.h                 |   10 -
 include/linux/mmzone.h                   |   14 +-
 include/linux/page-flags-layout.h        |   83 -----
 include/linux/sched.h                    |   44 +--
 include/uapi/linux/mempolicy.h           |   17 +-
 init/Kconfig                             |   14 -
 kernel/sched/core.c                      |   77 +---
 kernel/sched/debug.c                     |    3 -
 kernel/sched/fair.c                      |  579 ++----------------------------
 kernel/sched/features.h                  |   14 -
 kernel/sched/sched.h                     |   36 --
 kernel/sysctl.c                          |   45 +--
 mm/huge_memory.c                         |  251 +++----------
 mm/memory.c                              |  127 +------
 mm/mempolicy.c                           |  204 ++---------
 mm/migrate.c                             |   87 +----
 mm/mprotect.c                            |   31 +-
 mm/pgtable-generic.c                     |    9 +-
 32 files changed, 209 insertions(+), 1869 deletions(-)

Does that sound like what you need?

If Ingo hasn't removed/reverted that branch tomorrow, I can do this
revert again just after merging the tip tree.

> Also, I need to get a fresh mmotm into -next tomorrow.  Don't do
> anything until I've pulled that rabbit out of the hat :)

No worries.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
@ 2012-11-14  6:55     ` Stephen Rothwell
  0 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  6:55 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

[-- Attachment #1: Type: text/plain, Size: 4999 bytes --]

Hi Andrew,

On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> It would help if the old sched/numa code wasn't in -next while you're
> away.  That would give me a clean run at 3.7 and will make it easier
> for others to integrate and test the four(!) different
> autoschednumacore implementations on top of linux-next.
> 
> Pretty please?

So, your understanding is that the "old sched/numa code" won't (and
shouldn't) be merged into Linus' tree (for v3.7, or ever)?

In that case, what I can do is give you a tree that is the same as
akpm-base but with one of the merges in the tip tree reverted (and, in
fact, I could push that into akpm-base to make things easier for you).
I guess that would be the merge of the numa/core branch which would
result in the following commits being reverted:

Andrea Arcangeli (1):
      numa, mm: Support NUMA hinting page faults from gup/gup_fast

Gerald Schaefer (1):
      sched, numa, mm, s390/thp: Implement pmd_pgprot() for s390

Ingo Molnar (2):
      mm/pgprot: Move the pgprot_modify() fallback definition to mm.h
      sched, numa, mm: Add NUMA_MIGRATION feature flag

Lee Schermerhorn (3):
      mm/mpol: Add MPOL_MF_NOOP
      mm/mpol: Check for misplaced page
      mm/mpol: Add MPOL_MF_LAZY

Peter Zijlstra (17):
      sched, numa, mm: Make find_busiest_queue() a method
      sched, numa, mm: Describe the NUMA scheduling problem formally
      mm/thp: Preserve pgprot across huge page split
      mm/mpol: Make MPOL_LOCAL a real policy
      mm/mpol: Create special PROT_NONE infrastructure
      mm/migrate: Introduce migrate_misplaced_page()
      mm/mpol: Use special PROT_NONE to migrate pages
      sched, numa, mm: Introduce tsk_home_node()
      sched, numa, mm/mpol: Make mempolicy home-node aware
      sched, numa, mm: Introduce sched_feat_numa()
      sched, numa, mm: Implement THP migration
      sched, numa, mm: Implement home-node awareness
      sched, numa, mm: Introduce last_nid in the pageframe
      sched, numa, mm/mpol: Add_MPOL_F_HOME
      sched, numa, mm: Add fault driven placement and migration policy
      sched, numa, mm: Implement constant, per task Working Set Sampling (WSS) rate
      sched, numa, mm: Implement slow start for working set sampling

Ralf Baechle (1):
      sched, numa, mm, MIPS/thp: Add pmd_pgprot() implementation

Rik van Riel (6):
      mm/generic: Only flush the local TLB in ptep_set_access_flags()
      x86/mm: Only do a local tlb flush in ptep_set_access_flags()
      x86/mm: Introduce pte_accessible()
      mm: Only flush the TLB when clearing an accessible pte
      sched, numa, mm: Add credits for NUMA placement
      x86/mm: Completely drop the TLB flush from ptep_set_access_flags()

 CREDITS                                  |    1 -
 Documentation/scheduler/numa-problem.txt |  230 ------------
 arch/mips/include/asm/pgtable.h          |    2 -
 arch/s390/include/asm/pgtable.h          |   13 -
 arch/sh/mm/Kconfig                       |    1 -
 arch/x86/include/asm/pgtable.h           |    7 -
 arch/x86/mm/pgtable.c                    |    8 +-
 include/asm-generic/pgtable.h            |    4 -
 include/linux/huge_mm.h                  |   19 -
 include/linux/init_task.h                |    8 -
 include/linux/mempolicy.h                |    8 -
 include/linux/migrate.h                  |    7 -
 include/linux/migrate_mode.h             |    3 -
 include/linux/mm.h                       |  122 +++----
 include/linux/mm_types.h                 |   10 -
 include/linux/mmzone.h                   |   14 +-
 include/linux/page-flags-layout.h        |   83 -----
 include/linux/sched.h                    |   44 +--
 include/uapi/linux/mempolicy.h           |   17 +-
 init/Kconfig                             |   14 -
 kernel/sched/core.c                      |   77 +---
 kernel/sched/debug.c                     |    3 -
 kernel/sched/fair.c                      |  579 ++----------------------------
 kernel/sched/features.h                  |   14 -
 kernel/sched/sched.h                     |   36 --
 kernel/sysctl.c                          |   45 +--
 mm/huge_memory.c                         |  251 +++----------
 mm/memory.c                              |  127 +------
 mm/mempolicy.c                           |  204 ++---------
 mm/migrate.c                             |   87 +----
 mm/mprotect.c                            |   31 +-
 mm/pgtable-generic.c                     |    9 +-
 32 files changed, 209 insertions(+), 1869 deletions(-)

Does that sound like what you need?

If Ingo hasn't removed/reverted that branch tomorrow, I can do this
revert again just after merging the tip tree.

> Also, I need to get a fresh mmotm into -next tomorrow.  Don't do
> anything until I've pulled that rabbit out of the hat :)

No worries.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  6:47   ` Ingo Molnar
@ 2012-11-14  6:56     ` Andrew Morton
  2012-11-14  7:15       ` Stephen Rothwell
                         ` (2 more replies)
  0 siblings, 3 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  6:56 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Stephen Rothwell, linux-next, linux-kernel, Linus, Ingo Molnar,
	Hugh Dickins

On Wed, 14 Nov 2012 07:47:26 +0100 Ingo Molnar <mingo@kernel.org> wrote:

> 
> * Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > News: next-20121115 (i.e. tomorrow) will be the last release until
> > > next-20121126 (which should be just be after -rc7, I guess - assuming
> > > that Linus does not release v3.7 before then), so if you want something
> > > in linux-next for a reasonable amount of testing, it should probably be
> > > committed tomorrow.
> > 
> > It would help if the old sched/numa code wasn't in -next while 
> > you're away.  That would give me a clean run at 3.7 and will 
> > make it easier for others to integrate and test the four(!) 
> > different autoschednumacore implementations on top of 
> > linux-next.
> > 
> > Pretty please?
> 
> The next integration should have this solved: I have removed the 
> old sched/numa bits, replaced by the latest rebased/reworked 
> numa/core bits.
> 

That solves one problem, but I still need to route around the numa
stuff when preparing the 3.8-rc1 merge.  Again!

And yes, I'm assuming you're not targeting 3.8.  Given the history
behind this and the number of people who are looking at it, that's too
hasty.  Hugh can speak to his own reasons for feeling the same way.

And I must say that I deeply regret not digging my heels in when this
went into -next all those months ago.  It has caused a ton of trouble
for me and for a lot of other people.

Put it in -next after 3.8-rc1 with a view to a 3.9 merge, please.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  6:55     ` Stephen Rothwell
@ 2012-11-14  7:03       ` Stephen Rothwell
  -1 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  7:03 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]

On Wed, 14 Nov 2012 17:55:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > It would help if the old sched/numa code wasn't in -next while you're
> > away.  That would give me a clean run at 3.7 and will make it easier
> > for others to integrate and test the four(!) different
> > autoschednumacore implementations on top of linux-next.
> > 
> > Pretty please?
> 
> So, your understanding is that the "old sched/numa code" won't (and
> shouldn't) be merged into Linus' tree (for v3.7, or ever)?
> 
> In that case, what I can do is give you a tree that is the same as
> akpm-base but with one of the merges in the tip tree reverted (and, in
> fact, I could push that into akpm-base to make things easier for you).
> I guess that would be the merge of the numa/core branch which would
> result in the following commits being reverted:

Ok, ignore all this :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
@ 2012-11-14  7:03       ` Stephen Rothwell
  0 siblings, 0 replies; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  7:03 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]

On Wed, 14 Nov 2012 17:55:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 13 Nov 2012 21:37:42 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > It would help if the old sched/numa code wasn't in -next while you're
> > away.  That would give me a clean run at 3.7 and will make it easier
> > for others to integrate and test the four(!) different
> > autoschednumacore implementations on top of linux-next.
> > 
> > Pretty please?
> 
> So, your understanding is that the "old sched/numa code" won't (and
> shouldn't) be merged into Linus' tree (for v3.7, or ever)?
> 
> In that case, what I can do is give you a tree that is the same as
> akpm-base but with one of the merges in the tip tree reverted (and, in
> fact, I could push that into akpm-base to make things easier for you).
> I guess that would be the merge of the numa/core branch which would
> result in the following commits being reverted:

Ok, ignore all this :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  6:56     ` Andrew Morton
@ 2012-11-14  7:15       ` Stephen Rothwell
  2012-11-14  7:24         ` Andrew Morton
  2012-11-14  7:39       ` Ingo Molnar
  2012-11-14 17:19       ` Linus Torvalds
  2 siblings, 1 reply; 31+ messages in thread
From: Stephen Rothwell @ 2012-11-14  7:15 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Ingo Molnar, linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]

Hi Andrew,

On Tue, 13 Nov 2012 22:56:35 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 14 Nov 2012 07:47:26 +0100 Ingo Molnar <mingo@kernel.org> wrote:
> 
> > * Andrew Morton <akpm@linux-foundation.org> wrote:
> > 
> > > It would help if the old sched/numa code wasn't in -next while 
> > > you're away.  That would give me a clean run at 3.7 and will 
> > > make it easier for others to integrate and test the four(!) 
> > > different autoschednumacore implementations on top of 
> > > linux-next.
> > > 
> > > Pretty please?
> > 
> > The next integration should have this solved: I have removed the 
> > old sched/numa bits, replaced by the latest rebased/reworked 
> > numa/core bits.
> 
> That solves one problem, but I still need to route around the numa
> stuff when preparing the 3.8-rc1 merge.  Again!

I am not sure what is actually involved here, but would it help if I
made you a new akpm-base with the old tip tree replaced by the new one
that Ingo just pushed out?  Or are there still problematic things in the
tip tree?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  7:15       ` Stephen Rothwell
@ 2012-11-14  7:24         ` Andrew Morton
  0 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14  7:24 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ingo Molnar, linux-next, linux-kernel, Linus, Ingo Molnar, Hugh Dickins

On Wed, 14 Nov 2012 18:15:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> On Tue, 13 Nov 2012 22:56:35 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Wed, 14 Nov 2012 07:47:26 +0100 Ingo Molnar <mingo@kernel.org> wrote:
> > 
> > > * Andrew Morton <akpm@linux-foundation.org> wrote:
> > > 
> > > > It would help if the old sched/numa code wasn't in -next while 
> > > > you're away.  That would give me a clean run at 3.7 and will 
> > > > make it easier for others to integrate and test the four(!) 
> > > > different autoschednumacore implementations on top of 
> > > > linux-next.
> > > > 
> > > > Pretty please?
> > > 
> > > The next integration should have this solved: I have removed the 
> > > old sched/numa bits, replaced by the latest rebased/reworked 
> > > numa/core bits.
> > 
> > That solves one problem, but I still need to route around the numa
> > stuff when preparing the 3.8-rc1 merge.  Again!
> 
> I am not sure what is actually involved here, but would it help if I
> made you a new akpm-base with the old tip tree replaced by the new one
> that Ingo just pushed out?  Or are there still problematic things in the
> tip tree?

If this new code is targeted at 3.9 as I'm suggesting then it should go
into -next after 3.8-rc1, so the sched/numa part of -tip should be
omitted from -next until then.

If instead the plan is to merge it all into 3.8 then -tip should go
into -next as-is.

How's your crystal ball?

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  6:56     ` Andrew Morton
  2012-11-14  7:15       ` Stephen Rothwell
@ 2012-11-14  7:39       ` Ingo Molnar
  2012-11-14  8:13         ` Hugh Dickins
  2012-11-14 17:19       ` Linus Torvalds
  2 siblings, 1 reply; 31+ messages in thread
From: Ingo Molnar @ 2012-11-14  7:39 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Stephen Rothwell, linux-next, linux-kernel, Linus, Hugh Dickins


* Andrew Morton <akpm@linux-foundation.org> wrote:

> On Wed, 14 Nov 2012 07:47:26 +0100 Ingo Molnar <mingo@kernel.org> wrote:
> 
> > 
> > * Andrew Morton <akpm@linux-foundation.org> wrote:
> > 
> > > On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > 
> > > > News: next-20121115 (i.e. tomorrow) will be the last release until
> > > > next-20121126 (which should be just be after -rc7, I guess - assuming
> > > > that Linus does not release v3.7 before then), so if you want something
> > > > in linux-next for a reasonable amount of testing, it should probably be
> > > > committed tomorrow.
> > > 
> > > It would help if the old sched/numa code wasn't in -next while 
> > > you're away.  That would give me a clean run at 3.7 and will 
> > > make it easier for others to integrate and test the four(!) 
> > > different autoschednumacore implementations on top of 
> > > linux-next.
> > > 
> > > Pretty please?
> > 
> > The next integration should have this solved: I have removed the 
> > old sched/numa bits, replaced by the latest rebased/reworked 
> > numa/core bits.
> > 
> 
> That solves one problem, but I still need to route around the 
> numa stuff when preparing the 3.8-rc1 merge.  Again!

I'm eyeing a v3.8 merge... modulo unforeseen problems. This has 
been going on for way too long.

numa/core performs very well, and the rest can be done 
iteratively.

The mm/ bits changed very little due to the latest rounds of 
review. Most of the discussion centered around specific 
implementational details and naming - and where we were wrong I 
changed the code - numa/core sums up the consensus so far.

If I missed anything let me know and I'll fix the code ASAP ...

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  7:39       ` Ingo Molnar
@ 2012-11-14  8:13         ` Hugh Dickins
  2012-11-14 17:05           ` Rik van Riel
  0 siblings, 1 reply; 31+ messages in thread
From: Hugh Dickins @ 2012-11-14  8:13 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Andrew Morton, Stephen Rothwell, linux-next, linux-kernel,
	Linus Torvalds, Peter Zijlstra, Andrea Arcangeli, Mel Gorman,
	Rik van Riel

On Wed, 14 Nov 2012, Ingo Molnar wrote:
> * Andrew Morton <akpm@linux-foundation.org> wrote:
> > On Wed, 14 Nov 2012 07:47:26 +0100 Ingo Molnar <mingo@kernel.org> wrote:
> > > * Andrew Morton <akpm@linux-foundation.org> wrote:
> > > > On Wed, 14 Nov 2012 16:30:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > 
> > > > > News: next-20121115 (i.e. tomorrow) will be the last release until
> > > > > next-20121126 (which should be just be after -rc7, I guess - assuming
> > > > > that Linus does not release v3.7 before then), so if you want something
> > > > > in linux-next for a reasonable amount of testing, it should probably be
> > > > > committed tomorrow.
> > > > 
> > > > It would help if the old sched/numa code wasn't in -next while 
> > > > you're away.  That would give me a clean run at 3.7 and will 
> > > > make it easier for others to integrate and test the four(!) 
> > > > different autoschednumacore implementations on top of 
> > > > linux-next.
> > > > 
> > > > Pretty please?
> > > 
> > > The next integration should have this solved: I have removed the 
> > > old sched/numa bits, replaced by the latest rebased/reworked 
> > > numa/core bits.
> > > 
> > 
> > That solves one problem, but I still need to route around the 
> > numa stuff when preparing the 3.8-rc1 merge.  Again!
> 
> I'm eyeing a v3.8 merge... modulo unforeseen problems. This has 
> been going on for way too long.
> 
> numa/core performs very well, and the rest can be done 
> iteratively.
> 
> The mm/ bits changed very little due to the latest rounds of 
> review. Most of the discussion centered around specific 
> implementational details and naming - and where we were wrong I 
> changed the code - numa/core sums up the consensus so far.
> 
> If I missed anything let me know and I'll fix the code ASAP ...

Please, Ingo, stop trying to force this in ahead of time, yet again.

People are still reviewing and comparing competing solutions.
Maybe this latest will prove to be closest to the right answer,
maybe it will not.  It's, what, about two days old right now?

If we had wanted to push in a good solution a little prematurely,
we would surely have chosen Andrea's AutoNUMA months ago, despite
efforts to block it; and maybe we shall still want to go that way.

Please, forget about v3.8, cut this branch out of linux-next,
and seek consensus around getting it right for v3.9.

I dislike speaking out in this way, because I'm well aware of
how very much more effort you and Peter and Andrea and Mel and
Rik and many others are making than I can manage - thank you all.

Hugh

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  8:13         ` Hugh Dickins
@ 2012-11-14 17:05           ` Rik van Riel
  2012-11-15 12:10             ` Mel Gorman
  0 siblings, 1 reply; 31+ messages in thread
From: Rik van Riel @ 2012-11-14 17:05 UTC (permalink / raw)
  To: Hugh Dickins
  Cc: Ingo Molnar, Andrew Morton, Stephen Rothwell, linux-next,
	linux-kernel, Linus Torvalds, Peter Zijlstra, Andrea Arcangeli,
	Mel Gorman

On 11/14/2012 03:13 AM, Hugh Dickins wrote:

> Please, Ingo, stop trying to force this in ahead of time, yet again.
>
> People are still reviewing and comparing competing solutions.
> Maybe this latest will prove to be closest to the right answer,
> maybe it will not.  It's, what, about two days old right now?
>
> If we had wanted to push in a good solution a little prematurely,
> we would surely have chosen Andrea's AutoNUMA months ago, despite
> efforts to block it; and maybe we shall still want to go that way.

As much as I would like to see NUMA stuff going upstream
the day before yesterday, I have to agree with Hugh that
we need to do things right.

Having unreviewed (some of it NAKed) code sitting in
tip.git and you trying to force it upstream is not the
right way to go.

> Please, forget about v3.8, cut this branch out of linux-next,
> and seek consensus around getting it right for v3.9.

I suspect that no matter how long we delay merging the
NUMA placement code, we will always run into some kind
of regression. I am not sure if a delay will buy us much.

On the mm/ bits, there appears to be consensus already.
Mel Gorman's patch series contains the nicest mm/ bits
from autonuma and sched/numa, plus further improvements.
Andrea has supported Mel's series, and Ingo is pulling
code from it.

That leads me to believe Mel's NUMA bits may be worth
considering for 3.8.

On top of that, we could place the policy code by
Peter and Ingo, but as a nice reviewable patch series,
not hidden away through various tip.git branches.

Does a combination of Mel's NUMA mm/ bits and the
policy code from Peter and Ingo sound reasonable?

Mel, is that reasonable to you?

Peter & Ingo, are you willing to rebase your policy
code on top of Mel's mm/ patches?

-- 
All rights reversed

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14  6:56     ` Andrew Morton
  2012-11-14  7:15       ` Stephen Rothwell
  2012-11-14  7:39       ` Ingo Molnar
@ 2012-11-14 17:19       ` Linus Torvalds
  2 siblings, 0 replies; 31+ messages in thread
From: Linus Torvalds @ 2012-11-14 17:19 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Ingo Molnar, Stephen Rothwell, linux-next,
	Linux Kernel Mailing List, Ingo Molnar, Hugh Dickins

On Tue, Nov 13, 2012 at 10:56 PM, Andrew Morton
<akpm@linux-foundation.org> wrote:
>
> That solves one problem, but I still need to route around the numa
> stuff when preparing the 3.8-rc1 merge.  Again!

Btw - and this is tangential/unrelated - I really think that your
should strive to *not* base -mm on top of next, but instead put it on
top of the release kernel.

The "on top of next" approach not only causes you continual problems
like the above, it also causes the (related) problem that your email
patch-bombs always tend to be fairly late in the merge window, because
you need to wait for the big parts of linux-next to have hit my tree.

So it's more work for you, and it actually causes merge problems for me too.

I realize that you want to test a "everything" kernel, but at the same
time, that's actually counter-productive. It means that your tree ends
up depending on others, and you have to fight bugs that aren't even
necessarily yours at all.

And in this particular case, it would be easier for the NUMA people,
since your patches would presumably contain Mel's work, so they could
more easily rebase on top of your work, rather than the current
situation which is ass-backwards and has fundamental odering problems:
you want to base your stuff on linux-next, people want to put their
numa stuff into linux-next, and you have a bad circle.

Of course, people who want to base their work on top of Mel's code
often are git users already, so now they'd want a stable git tree
(non-rebased) to work on top, so they'd have problems with -mm anyway.
I don't know if Mel is a git user at all (there are no commits in the
kernel tree that are done by Mel, but maybe Mel has used git
elsewhere), but in this case maybe it would be a possibility that
Mel's NUMA patches could be done as one single stable -git branch, and
come into -mm (and linux-next) that way?

So I really think it would be much nicer if you just did your tree
directly on top of mine, instead of on top of linux-next. It would
make everything easier for everybody.

Of course, if you then want to test the combined thing, that's fine,
but that merging is also something that git is pretty good at. You
could just check the linux-next tree itself, since then Stephen would
have done the merging for you.

                  Linus

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14 (gpu/drm/i915)
  2012-11-14  5:30 ` Stephen Rothwell
  (?)
  (?)
@ 2012-11-14 19:41 ` Randy Dunlap
  2012-11-14 20:17   ` Andrew Morton
  -1 siblings, 1 reply; 31+ messages in thread
From: Randy Dunlap @ 2012-11-14 19:41 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Linus, Andrew Morton, dri-devel, Dave Airlie

On 11/13/2012 09:30 PM, Stephen Rothwell wrote:

> Hi all,
> 
> News: next-20121115 (i.e. tomorrow) will be the last release until
> next-20121126 (which should be just be after -rc7, I guess - assuming
> that Linus does not release v3.7 before then), so if you want something
> in linux-next for a reasonable amount of testing, it should probably be
> committed tomorrow.
> 
> Changes since 20121113:
> 



on i386:

ERROR: "__build_bug_on_failed" [drivers/gpu/drm/i915/i915.ko] undefined!

Reference to that symbol is found in
i915_gem_execbuffer.o.  Reference to BUILD_BUG_ON() is found in
i915_gem_execbuffer.c:

static struct eb_objects *
eb_create(int size)
{
	struct eb_objects *eb;
	int count = PAGE_SIZE / sizeof(struct hlist_head) / 2;
	BUILD_BUG_ON(!is_power_of_2(PAGE_SIZE / sizeof(struct hlist_head)));


-- 
~Randy

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14 (gpu/drm/i915)
  2012-11-14 19:41 ` linux-next: Tree for Nov 14 (gpu/drm/i915) Randy Dunlap
@ 2012-11-14 20:17   ` Andrew Morton
  0 siblings, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2012-11-14 20:17 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, linux-next, linux-kernel, Linus, dri-devel,
	Dave Airlie

On Wed, 14 Nov 2012 11:41:49 -0800
Randy Dunlap <rdunlap@infradead.org> wrote:

> On 11/13/2012 09:30 PM, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > News: next-20121115 (i.e. tomorrow) will be the last release until
> > next-20121126 (which should be just be after -rc7, I guess - assuming
> > that Linus does not release v3.7 before then), so if you want something
> > in linux-next for a reasonable amount of testing, it should probably be
> > committed tomorrow.
> > 
> > Changes since 20121113:
> > 
> 
> 
> 
> on i386:
> 
> ERROR: "__build_bug_on_failed" [drivers/gpu/drm/i915/i915.ko] undefined!
> 
> Reference to that symbol is found in
> i915_gem_execbuffer.o.  Reference to BUILD_BUG_ON() is found in
> i915_gem_execbuffer.c:
> 
> static struct eb_objects *
> eb_create(int size)
> {
> 	struct eb_objects *eb;
> 	int count = PAGE_SIZE / sizeof(struct hlist_head) / 2;
> 	BUILD_BUG_ON(!is_power_of_2(PAGE_SIZE / sizeof(struct hlist_head)));
> 

Where to start.

- eb_create() has no business assuming that the hlist_head has any
  particular size.  We could easily add some conditionally-compiled
  debug fields in there, and drm blows up.

- The assertion is obviously true at present, so I assume that gcc
  screwed up and failed to reduce all that to a compile-time constant.

- We have a BUILD_BUG_ON_NOT_POWER_OF_2().  Use it?

- This code is using PAGE_SIZE to scale a kernel data structure. 
  PAGE_SIZE can vary by a factor of 16, depending on Kconfig.  This
  can result in 64k PAGE_SIZE machines exhibiting different beahviour
  from that which the testers saw.

  Don't do it.  It's better to hard-wire 4096.


^ permalink raw reply	[flat|nested] 31+ messages in thread

* [PATCH 1/2] asm-generic: add __WARN() to bug.h
  2012-11-14  5:30 ` Stephen Rothwell
@ 2012-11-15  0:59   ` Randy Dunlap
  -1 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  0:59 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Stephen Rothwell, linux-next, linux-kernel, Andrew Morton,
	linux-arch, Rafael Aquini, linux-mm

From: Randy Dunlap <rdunlap@infradead.org>

Add __WARN() macro for the case of CONFIG_BUG is not enabled.
This fixes a build error in mm/balloon_compaction.c.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: Rafael Aquini <aquini@redhat.com>
Cc: linux-mm@kvack.org
---
 include/asm-generic/bug.h |    4 ++++
 1 file changed, 4 insertions(+)

--- linux-next-20121114.orig/include/asm-generic/bug.h
+++ linux-next-20121114/include/asm-generic/bug.h
@@ -129,6 +129,10 @@ extern void warn_slowpath_null(const cha
 })
 #endif
 
+#ifndef __WARN
+#define __WARN()	do {} while (0)
+#endif
+
 #define WARN_TAINT(condition, taint, format...) WARN_ON(condition)
 
 #endif

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [PATCH 1/2] asm-generic: add __WARN() to bug.h
@ 2012-11-15  0:59   ` Randy Dunlap
  0 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  0:59 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Stephen Rothwell, linux-next, linux-kernel, Andrew Morton,
	linux-arch, Rafael Aquini, linux-mm

From: Randy Dunlap <rdunlap@infradead.org>

Add __WARN() macro for the case of CONFIG_BUG is not enabled.
This fixes a build error in mm/balloon_compaction.c.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: Rafael Aquini <aquini@redhat.com>
Cc: linux-mm@kvack.org
---
 include/asm-generic/bug.h |    4 ++++
 1 file changed, 4 insertions(+)

--- linux-next-20121114.orig/include/asm-generic/bug.h
+++ linux-next-20121114/include/asm-generic/bug.h
@@ -129,6 +129,10 @@ extern void warn_slowpath_null(const cha
 })
 #endif
 
+#ifndef __WARN
+#define __WARN()	do {} while (0)
+#endif
+
 #define WARN_TAINT(condition, taint, format...) WARN_ON(condition)
 
 #endif

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
  2012-11-14  5:30 ` Stephen Rothwell
@ 2012-11-15  0:59   ` Randy Dunlap
  -1 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  0:59 UTC (permalink / raw)
  To: Rafael Aquini
  Cc: Stephen Rothwell, linux-mm, linux-next, linux-kernel, Andrew Morton

From: Randy Dunlap <rdunlap@infradead.org>

Fix build when CONFIG_BUG is not enabled by adding header file
<asm-generic/bug.h>:

mm/balloon_compaction.c: In function 'balloon_page_putback':
mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Rafael Aquini <aquini@redhat.com>
---
 mm/balloon_compaction.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20121114.orig/mm/balloon_compaction.c
+++ linux-next-20121114/mm/balloon_compaction.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/balloon_compaction.h>
+#include <asm-generic/bug.h>
 
 /*
  * balloon_devinfo_alloc - allocates a balloon device information descriptor.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
@ 2012-11-15  0:59   ` Randy Dunlap
  0 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  0:59 UTC (permalink / raw)
  To: Rafael Aquini
  Cc: Stephen Rothwell, linux-mm, linux-next, linux-kernel, Andrew Morton

From: Randy Dunlap <rdunlap@infradead.org>

Fix build when CONFIG_BUG is not enabled by adding header file
<asm-generic/bug.h>:

mm/balloon_compaction.c: In function 'balloon_page_putback':
mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Rafael Aquini <aquini@redhat.com>
---
 mm/balloon_compaction.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20121114.orig/mm/balloon_compaction.c
+++ linux-next-20121114/mm/balloon_compaction.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/balloon_compaction.h>
+#include <asm-generic/bug.h>
 
 /*
  * balloon_devinfo_alloc - allocates a balloon device information descriptor.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 1/2] asm-generic: add __WARN() to bug.h
  2012-11-15  0:59   ` Randy Dunlap
@ 2012-11-15  1:28     ` David Rientjes
  -1 siblings, 0 replies; 31+ messages in thread
From: David Rientjes @ 2012-11-15  1:28 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Arnd Bergmann, Stephen Rothwell, linux-next, linux-kernel,
	Andrew Morton, linux-arch, Rafael Aquini, linux-mm

On Wed, 14 Nov 2012, Randy Dunlap wrote:

> --- linux-next-20121114.orig/include/asm-generic/bug.h
> +++ linux-next-20121114/include/asm-generic/bug.h
> @@ -129,6 +129,10 @@ extern void warn_slowpath_null(const cha
>  })
>  #endif
>  
> +#ifndef __WARN
> +#define __WARN()	do {} while (0)
> +#endif
> +
>  #define WARN_TAINT(condition, taint, format...) WARN_ON(condition)
>  
>  #endif

__WARN() isn't supposed to be used by generic code, though.  The 
mm/balloon_compaction.c error should be resolved by 
mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
added to -mm today.  It converts the __WARN() there into WARN_ON(1) which 
is defined appropriately for CONFIG_BUG=n.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 1/2] asm-generic: add __WARN() to bug.h
@ 2012-11-15  1:28     ` David Rientjes
  0 siblings, 0 replies; 31+ messages in thread
From: David Rientjes @ 2012-11-15  1:28 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Arnd Bergmann, Stephen Rothwell, linux-next, linux-kernel,
	Andrew Morton, linux-arch, Rafael Aquini, linux-mm

On Wed, 14 Nov 2012, Randy Dunlap wrote:

> --- linux-next-20121114.orig/include/asm-generic/bug.h
> +++ linux-next-20121114/include/asm-generic/bug.h
> @@ -129,6 +129,10 @@ extern void warn_slowpath_null(const cha
>  })
>  #endif
>  
> +#ifndef __WARN
> +#define __WARN()	do {} while (0)
> +#endif
> +
>  #define WARN_TAINT(condition, taint, format...) WARN_ON(condition)
>  
>  #endif

__WARN() isn't supposed to be used by generic code, though.  The 
mm/balloon_compaction.c error should be resolved by 
mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
added to -mm today.  It converts the __WARN() there into WARN_ON(1) which 
is defined appropriately for CONFIG_BUG=n.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
  2012-11-15  0:59   ` Randy Dunlap
@ 2012-11-15  1:29     ` David Rientjes
  -1 siblings, 0 replies; 31+ messages in thread
From: David Rientjes @ 2012-11-15  1:29 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Rafael Aquini, Stephen Rothwell, linux-mm, linux-next,
	linux-kernel, Andrew Morton

On Wed, 14 Nov 2012, Randy Dunlap wrote:

> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build when CONFIG_BUG is not enabled by adding header file
> <asm-generic/bug.h>:
> 
> mm/balloon_compaction.c: In function 'balloon_page_putback':
> mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'
> 

This is fixed by 
mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
in -mm which converts it to WARN_ON(1) which is the generic way to trigger 
a warning.

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
@ 2012-11-15  1:29     ` David Rientjes
  0 siblings, 0 replies; 31+ messages in thread
From: David Rientjes @ 2012-11-15  1:29 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Rafael Aquini, Stephen Rothwell, linux-mm, linux-next,
	linux-kernel, Andrew Morton

On Wed, 14 Nov 2012, Randy Dunlap wrote:

> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build when CONFIG_BUG is not enabled by adding header file
> <asm-generic/bug.h>:
> 
> mm/balloon_compaction.c: In function 'balloon_page_putback':
> mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'
> 

This is fixed by 
mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
in -mm which converts it to WARN_ON(1) which is the generic way to trigger 
a warning.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
  2012-11-15  1:29     ` David Rientjes
@ 2012-11-15  1:29       ` Randy Dunlap
  -1 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  1:29 UTC (permalink / raw)
  To: David Rientjes
  Cc: Rafael Aquini, Stephen Rothwell, linux-mm, linux-next,
	linux-kernel, Andrew Morton

On 11/14/2012 05:29 PM, David Rientjes wrote:

> On Wed, 14 Nov 2012, Randy Dunlap wrote:
> 
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build when CONFIG_BUG is not enabled by adding header file
>> <asm-generic/bug.h>:
>>
>> mm/balloon_compaction.c: In function 'balloon_page_putback':
>> mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'
>>
> 
> This is fixed by 
> mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
> in -mm which converts it to WARN_ON(1) which is the generic way to trigger 
> a warning.
> --


OK, thanks for the info.

-- 
~Randy

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h
@ 2012-11-15  1:29       ` Randy Dunlap
  0 siblings, 0 replies; 31+ messages in thread
From: Randy Dunlap @ 2012-11-15  1:29 UTC (permalink / raw)
  To: David Rientjes
  Cc: Rafael Aquini, Stephen Rothwell, linux-mm, linux-next,
	linux-kernel, Andrew Morton

On 11/14/2012 05:29 PM, David Rientjes wrote:

> On Wed, 14 Nov 2012, Randy Dunlap wrote:
> 
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build when CONFIG_BUG is not enabled by adding header file
>> <asm-generic/bug.h>:
>>
>> mm/balloon_compaction.c: In function 'balloon_page_putback':
>> mm/balloon_compaction.c:243:3: error: implicit declaration of function '__WARN'
>>
> 
> This is fixed by 
> mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix-fix.patch 
> in -mm which converts it to WARN_ON(1) which is the generic way to trigger 
> a warning.
> --


OK, thanks for the info.

-- 
~Randy

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: linux-next: Tree for Nov 14
  2012-11-14 17:05           ` Rik van Riel
@ 2012-11-15 12:10             ` Mel Gorman
  0 siblings, 0 replies; 31+ messages in thread
From: Mel Gorman @ 2012-11-15 12:10 UTC (permalink / raw)
  To: Rik van Riel
  Cc: Hugh Dickins, Ingo Molnar, Andrew Morton, Stephen Rothwell,
	linux-next, linux-kernel, Linus Torvalds, Peter Zijlstra,
	Andrea Arcangeli

On Wed, Nov 14, 2012 at 12:05:15PM -0500, Rik van Riel wrote:
> On 11/14/2012 03:13 AM, Hugh Dickins wrote:
> 
> >Please, Ingo, stop trying to force this in ahead of time, yet again.
> >
> >People are still reviewing and comparing competing solutions.
> >Maybe this latest will prove to be closest to the right answer,
> >maybe it will not.  It's, what, about two days old right now?
> >
> >If we had wanted to push in a good solution a little prematurely,
> >we would surely have chosen Andrea's AutoNUMA months ago, despite
> >efforts to block it; and maybe we shall still want to go that way.
> 
> As much as I would like to see NUMA stuff going upstream
> the day before yesterday, I have to agree with Hugh that
> we need to do things right.
> 

After my last test of tests against schednuma I have to agree. While the
differences we see in different tests could be explained by different JVM
configurations, it does not tell us *why* they performed differently. Because
of the monolithic nature of some of the patches it's non-trivial to
establish which part is causing the problems.  I still have not got
around to sending the latest schednuma through a spidey decoder ring to
see exactly how it works.  FWIW the idea that is described sounds great.

> Having unreviewed (some of it NAKed) code sitting in
> tip.git and you trying to force it upstream is not the
> right way to go.
> 
> >Please, forget about v3.8, cut this branch out of linux-next,
> >and seek consensus around getting it right for v3.9.
> 
> I suspect that no matter how long we delay merging the
> NUMA placement code, we will always run into some kind
> of regression. I am not sure if a delay will buy us much.
> 
> On the mm/ bits, there appears to be consensus already.
> Mel Gorman's patch series contains the nicest mm/ bits
> from autonuma and sched/numa, plus further improvements.
> Andrea has supported Mel's series, and Ingo is pulling
> code from it.
> 
> That leads me to believe Mel's NUMA bits may be worth
> considering for 3.8.
> 

I still think the series is not fully baked.  I'm still working on getting
some of the basics right and getting the System CPU usage down which right
now is through the roof. It's going to take me time and while I think I'll
have something working semi-properly by 3.8 rolls around I severely doubt
it'll have seen any wide-spread testing.  My preference is the final result
be sortof comparable with autonumas performance but satisfy the scheduler
folk in terms of how it integrates with kernel/sched/* and not use kernel
threads except as a last resort.

Big chunks are still missing. No knob for turning off from command line,
no THP native migration (getting the simple case right first), placement
policy is still extremely heavy (was run in kernel thread context before and
needs to change now), page struct elements are not folded into page->flags,
task_struct has fields that should move to task_struct->task_balancenuma,
no docs etc etc etc.

> On top of that, we could place the policy code by
> Peter and Ingo, but as a nice reviewable patch series,
> not hidden away through various tip.git branches.
> 
> Does a combination of Mel's NUMA mm/ bits and the
> policy code from Peter and Ingo sound reasonable?
> 
> Mel, is that reasonable to you?
> 

It'd be reasonable to me. Preferably patches would affect individual areas
rather than being a large patch affecting multiple areas. As well as being
easier to comprehend, we can also bisect the result. To me, the obvious
discrete areas that a single patch would affect are

1. The PTE update helper functions
2. The PTE scanning machinary driven from task_numa_tick
3. Task and process fault accounting and how that information is used
   to determine if a page is misplaced
4. Fault handling, migrating the page if misplaced, what information is
   provided to the placement policy

Obviously that is not always possible.

Thanks to the kernel.org folk I have a git tree at

	git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma.git

The mm-balancenuma-v1r15[*] and mm-balancenuma-v2r45 branches correspond to
the V1 and V2 series I released. I've pushed a mm-balancenuma-v3r22-snapshot
branch which is unreleased but shows where the tree currently stands.
Almost nothing in there after the initial placement policy has been tested
at all but it shows the initial adjustment to how PMD faults are handled
and some preliminary migration rate-limiting code. The same patches when
complete should be usable by schednuma be it due to a rebase on top or
because they pull the patches in and adjust them accordingly.

-- 
Mel Gorman
SUSE Labs

^ permalink raw reply	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2012-11-15 12:11 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-14  5:30 linux-next: Tree for Nov 14 Stephen Rothwell
2012-11-14  5:30 ` Stephen Rothwell
2012-11-14  5:37 ` Andrew Morton
2012-11-14  5:37   ` Andrew Morton
2012-11-14  5:53   ` Andrew Morton
2012-11-14  5:53     ` Andrew Morton
2012-11-14  6:47   ` Ingo Molnar
2012-11-14  6:56     ` Andrew Morton
2012-11-14  7:15       ` Stephen Rothwell
2012-11-14  7:24         ` Andrew Morton
2012-11-14  7:39       ` Ingo Molnar
2012-11-14  8:13         ` Hugh Dickins
2012-11-14 17:05           ` Rik van Riel
2012-11-15 12:10             ` Mel Gorman
2012-11-14 17:19       ` Linus Torvalds
2012-11-14  6:55   ` Stephen Rothwell
2012-11-14  6:55     ` Stephen Rothwell
2012-11-14  7:03     ` Stephen Rothwell
2012-11-14  7:03       ` Stephen Rothwell
2012-11-14 19:41 ` linux-next: Tree for Nov 14 (gpu/drm/i915) Randy Dunlap
2012-11-14 20:17   ` Andrew Morton
2012-11-15  0:59 ` [PATCH 1/2] asm-generic: add __WARN() to bug.h Randy Dunlap
2012-11-15  0:59   ` Randy Dunlap
2012-11-15  1:28   ` David Rientjes
2012-11-15  1:28     ` David Rientjes
2012-11-15  0:59 ` [PATCH 2/2] mm: balloon_compaction.c needs asm-generic/bug.h Randy Dunlap
2012-11-15  0:59   ` Randy Dunlap
2012-11-15  1:29   ` David Rientjes
2012-11-15  1:29     ` David Rientjes
2012-11-15  1:29     ` Randy Dunlap
2012-11-15  1:29       ` Randy Dunlap

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.