Hi all, There will be no linux-next tomorrow. Changes since 20120507: Linus' tree lost its build failure. The net-next tree gained a conflict against the ceph tree. The crypto tree lost its conflicts. The kbuild tree lost its build failure. The battery tree still had its build failure for which I reverted 2 commits. The drm tree lost its conflict. The driver-core tree gained a build failure for which I reverted a commit. The usb tree lost a conflict. The arm-soc tree gained a conflict against the crypto tree. The akpm tree lost a patch that turned up elsewhere. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 190 trees (counting Linus' and 27 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (febb72a IA32 emulation: Fix build problem for modular ia32 a.out support) Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi) Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17) Merging arm-current/fixes (fde165b ARM: 7414/1: SMP: prevent use of the console when using idmap_pgd) Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels) Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices) Merging powerpc-merge/merge (810b4de tty/serial/pmac_zilog: Fix "nobody cared" IRQ message) Merging sparc/master (e9a5ea1 sparc32,leon: add notify_cpu_starting()) Merging net/master (1c430a7 net: compare_ether_addr[_64bits]() has no ordering) Merging sound-current/for-linus (f5c53d8 ALSA: hda/realtek - Add a fixup for Acer Aspire 5739G) Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging wireless/master (ed90542 iwlwifi: fix skb truesize underestimation) Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5) Merging tty.current/tty-linus (84f904e vt: Fix deadlock on scroll-lock) Merging usb.current/usb-linus (d48b97b Linux 3.4-rc6) Merging staging.current/staging-linus (69964ea Linux 3.4-rc5) Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3) Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes) Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads) Merging md-current/for-linus (b16b1b6 md/bitmap: fix calculation of 'chunks' - missing shift.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers) Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging sh-current/sh-fixes-for-linus (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus) Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting) Merging devicetree-current/devicetree/merge (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds) Merging spi-current/spi/merge (2431a81 spi/spi-bfin5xx: Fix flush of last bit after each spi transfer) Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file) Merging arm/for-next (e3fa215 Merge branch 'misc' into for-next) Merging arm-perf/for-next/perf (c16fa4f Linux 3.3) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging renesas/next (b56f70f Merge branch 'renesas-armadillo800eva' into renesas-next) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) Merging s5p/for-next (de12e47 Merge branch 'next/board-samsung' into for-next) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (431e69e blackfin: asm: fix blackfin.h broken) Merging c6x/for-linux-next (18d1470 C6X: change main arch kbuild symbol) Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile) Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal) Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method) Merging m68k/for-next (c663600 m68k: Correct the Atari ALLOWINT definition) Merging m68knommu/for-next (a964727 m68knommu: simplify the ColdFire 5407 GPIO struct setup) Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o) Merging mips/mips-for-linux-next (1dc4740 Merge branches 'fixes-for-linus', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next) Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h) Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next) Merging powerpc/next (43671cc powerpc/windfarm: don't pass const strings to snprintf) Merging 4xx/next (dce4c92 powerpc/40x: Use {upper,lower}_32_bits for msi_phys) Merging mpc5xxx/next (09f61ff powerpc: Option FB_FSL_DIU is not really optional for mpc512x) Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0) Merging s390/features (2cbcba6 [S390] Remove dead code from signal handler) Merging sh/sh-latest (b2212ea sh64: Kill off unused trap_no/error_code from thread_struct.) Merging sparc-next/master (799d40c sparc64: Do not set max_mapnr.) Merging tile/master (5e4ce7a arch/tile: tilegx PCI root complex support) Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) Merging ceph/master (8b39326 crush: warn on do_rule failure) Merging cifs/for-next (5c503f8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6) Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic()) CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h Merging ext3/for_next (77f0a97 jbd: Write journal superblock with WRITE_FUA after checkpointing) Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features) Merging fuse/for-next (519c604 fuse: optimize fallocate on permanent failure) Merging gfs2/master (f9425ad GFS2: Fix sgid propagation when using ACLs) Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio) Merging nfs/linux-next (7369b86 Merge branch 'bugfixes' into linux-next) Merging nfsd/nfsd-next (3559ef0 rpc: handle rotated gss data for Windows interoperability) Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux) Merging ubifs/linux-next (1bdcc63 UBIFS: remove xattr Kconnfig option) Merging xfs/for-next (bc236c3 xfs: use shared ilock mode for direct IO writes by default) Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern) Merging pci/next (74d24b2 resources: add resource_overlaps()) Merging hid/for-next (7339d4d Merge branch 'wacom' into for-next) Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN) Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c Merging i2c-embedded/i2c-embedded/for-next (b5a9352 I2C: xiic: Add OF binding support) Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver) Merging hwmon-staging/hwmon-next (d63b478 hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT) Merging v4l-dvb/master (49083a0 Merge /home/v4l/v4l/for_upstream) CONFLICT (content): Merge conflict in drivers/usb/gadget/uvc_queue.c Merging kbuild/for-next (248784a Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) Merging libata/NEXT (8d899e7 libata-eh don't waste time retrying media errors (v3)) Merging infiniband/for-next (cccf38f Merge branch 'core' into for-next) Merging acpi/next (2ce431f Merge branch 'd3hot-v-d3cold-fix' into build) Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling) Merging ubi/linux-next (a7b595c UBI: always warn if case of I/O errors) Merging dlm/next (1a058f5 gfs2: fix recovery during unmount) Merging scsi/for-next (b965030 Merge branch 'misc' into for-next) Merging target-updates/for-next (a39a3cc target: Only check max_sectors for passthrough backend I/O) Merging target-merge/for-next-merge (595f445 tcm_qla2xxx: Add >= 24xx series fabric module for target-core) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (5d8f50d merge: devel rnc-devel fixes) Merging slave-dma/next (56cbb3d Merge branch 'fixes' into next) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) Merging net-next/master (8a05ba0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next) CONFLICT (content): Merge conflict in net/ceph/osdmap.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-trans.h CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-rx.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/param.c CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h Merging wireless-next/master (0a9b378 {nl,cfg,mac}80211: Allow user to see/configure HT protection mode) CONFLICT (content): Merge conflict in net/wireless/nl80211.c Merging bluetooth/master (d397968 Bluetooth: Refactor L2CAP ERTM and streaming transmit segmentation) Merging mtd/master (226bb7d jffs2: Fix lock acquisition order bug in gc path) Merging l2-mtd/master (bf93185 mtd: nand: fixup 1/0 vs. true/false) Merging crypto/master (8a63b19 crypto: ux500 - Add driver for HASH hardware) Merging sound/for-next (3de435b Merge branch 'topic/misc' into for-next) Merging sound-asoc/for-next (c7dfc7a Merge branch 'for-3.5' into asoc-next) Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.) Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.) CONFLICT (content): Merge conflict in init/main.c CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c Merging input/next (2872a9b Input: evdev - properly handle read/write with count 0) Merging input-mt/for-next (66f75a5 Linux 3.4-rc4) Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail()) CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging block/for-next (d634e66 Merge branch 'for-3.5/core' into for-next) CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging quilt/device-mapper (27fd946 Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").) 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 (9a59701 mmc: mmci: Use correct GPIO binding for IRQ requests) Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()) Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (39389cf MD RAID1: Further conditionalize 'fullsync') Merging mfd/for-next (ceb57d2 mfd: Convert wm8994 to module_i2c_driver()) Merging battery/master (fcc015c smb347-charger: Clean up battery attributes) [master 1aca473] Revert "smb347-charger: Clean up battery attributes" [master d3f8cd0] Revert "smb347-charger: Convert to regmap API" Merging drm/drm-next (4f256e8 Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next) Merging fbdev/fbdev-next (3499b1d Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (8b53d99 OMAPDSS: DISPC: Correct DISPC functional clock usage) Merging regulator/for-next (2b0db8e Merge branch 'regulator-drivers' into regulator-next) Merging security/next (898bfc1 Merge tag 'v3.4-rc5' into next) CONFLICT (content): Merge conflict in include/linux/filter.h CONFLICT (content): Merge conflict in arch/x86/Kconfig Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (963306b watchdog: Add watchdog_active() routine) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (7aff2d0 Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next) Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (d132d7f Kconfig: replace "--- help ---" with "---help---") CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree. $ git rm -f sound/soc/imx/Kconfig Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (1fb9873 PM / Domains: Fix computation of maximum domain off time) Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info) Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries) Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory) Merging tip/auto-latest (dc71c17 Merge branch 'timers/urgent') CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in Makefile Applying: kbuild: merge fix for sorting exceptions tables at build time Merging rcu/rcu/next (9e03688 Merge branches 'barrier.2012.05.04b', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.04.30a' into HEAD) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error) Merging kvm/linux-next (e726b1b KVM: s390: implement KVM_CAP_NR/MAX_VCPUS) CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging kvm-ppc/kvm-ppc-next (07dc7a4 KVM: PPC: Emulator: clean up SPR reads and writes) Merging oprofile/for-next (c16fa4f Linux 3.3) Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) Merging xen-two/linux-next (bdb1a8b Revert "xen: EXPORT_SYMBOL set_phys_to_machine") Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (6c41792 percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit) Merging workqueues/for-next (0976dfc workqueue: Catch more locking problems with flush_work()) Merging drivers-x86/linux-next (ad229c5 toshiba_acpi: Add support for transflective LCD) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) Merging regmap/for-next (56ef671 Merge branches 'regmap-core' and 'regmap-stride' into regmap-next) CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging driver-core/driver-core-next (a9e7321 Fix a mistake sentence in the file 'Documentation/zh_CN/magic-number.txt') Merging tty/tty-next (abcefe5 tty/amiserial: Add missing argument for tty_unlock()) Merging usb/usb-next (bfb8bfa USB: make vendor id of root hubs greppable) CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/core/inode.c left in tree. CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_wac.c $ git rm -f drivers/usb/core/inode.c Merging staging/staging-next (61cd983 Staging: Comedi adv_pci1710 : Corrected over 80 column warnings) CONFLICT (modify/delete): drivers/staging/serial/68360serial.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/serial/68360serial.c left in tree. CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c CONFLICT (content): Merge conflict in drivers/staging/android/Makefile CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig CONFLICT (content): Merge conflict in drivers/Makefile CONFLICT (content): Merge conflict in drivers/Kconfig $ git rm -f drivers/staging/serial/68360serial.c Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers) Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next) Merging writeback/writeback-for-next (169ebd9 writeback: Avoid iput() from flusher thread) Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (1772311 pinctrl: add pinctrl-mxs support) CONFLICT (content): Merge conflict in drivers/pinctrl/core.c CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt Merging tegra/for-next (264b11d Merge branch 'for-3.5/defconfig' into for-next) Merging moduleh/for-sfr (5e5b0c7 powerpc: fix compile fail in hugetlb cmdline parsing) Merging vhost/linux-next (53ffd22 virtio-net: remove useless disable on freeze) CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal) Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400) CONFLICT (content): Merge conflict in drivers/Kconfig Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/) Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86) Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio) Merging arm-soc/for-next (6f1f0d2 Merge branch 'next/dt' into for-next) CONFLICT (content): Merge conflict in lib/Makefile CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/mfd/ab5500-core.c left in tree. CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c CONFLICT (modify/delete): arch/arm/mach-ixp23xx/roadrunner.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/roadrunner.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp23xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/pci.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp23xx/ixdp2351.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/ixdp2351.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp23xx/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/include/mach/platform.h left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/pci.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2x01.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2x01.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2800.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2800.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2400.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2400.c left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/include/mach/platform.h left in tree. CONFLICT (modify/delete): arch/arm/mach-ixp2000/enp2611.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/enp2611.c left in tree. $ git rm -f drivers/mfd/ab5500-core.c $ git rm -f -r arch/arm/mach-ixp2000 arch/arm/mach-ixp23xx Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device) Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA) Merging dma-mapping/dma-mapping-next (c6b1f07 ARM: integrate CMA with DMA-mapping subsystem) CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h Merging dma-buf/for-next (69964ea Linux 3.4-rc5) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: pagemap.h: fix warning about possibly used before init var Applying: proc/pid/pagemap: correctly report non-present ptes and holes between vmas Applying: mm: fix division by 0 in percpu_pagelist_fraction() Applying: hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow() Applying: namespaces, pid_ns: fix leakage on fork() failure Applying: memcg: free spare array to avoid memory leak Applying: drivers/leds: correct __devexit annotations Applying: umem: fix up unplugging Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver Applying: arch/x86/include/asm/spinlock.h: fix comment Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ Applying: avr32: don't mask signals in the error path Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn Applying: avr32: use block_sigmask() Applying: m32r: use set_current_blocked() and block_sigmask() Applying: m68k: use set_current_blocked() and block_sigmask() Applying: mn10300: use set_current_blocked() and block_sigmask() Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call Applying: cpuidle: add checks to avoid NULL pointer dereference Applying: cris: use set_current_blocked() and block_sigmask() Applying: cris: select GENERIC_ATOMIC64 Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix Applying: x86: change percpu_read_stable() to this_cpu_read_stable() Applying: net: use this_cpu_xxx replace percpu_xxx funcs Applying: percpu: remove percpu_xxx() functions Applying: percpu-remove-percpu_xxx-functions-fix Applying: timeconst.pl: remove deprecated defined(@array) Applying: ia64: use set_current_blocked() and block_sigmask() Applying: microblaze: don't reimplement force_sigsegv() Applying: microblaze: no need to reset handler if SA_ONESHOT Applying: microblaze: fix signal masking Applying: microblaze: use set_current_blocked() and block_sigmask() Applying: score: don't mask signals if we fail to setup signal stack Applying: score: use set_current_blocked() and block_sigmask() Applying: h8300: use set_current_blocked() and block_sigmask() Applying: drivers/thermal/spear_thermal.c: add Device Tree probing capability Applying: unicore32: use block_sigmask() Applying: connector/userns: replace netlink uses of cap_raised with capable. Applying: blackfin: use set_current_blocked() and block_sigmask() Applying: ocfs2: use find_last_bit() Applying: ocfs2: use bitmap_weight() Applying: drivers/scsi/ufs: use module_pci_driver Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic Applying: drivers/scsi/ufs: fix evaluation of task_failed status Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED Applying: drivers/scsi/atp870u.c: fix bad use of udelay Applying: vfs: increment iversion when a file is truncated Applying: fs: symlink restrictions on sticky directories Applying: fs: hardlink creation restrictions Applying: fsnotify: remove unused parameter from send_to_group() Applying: fsnotify: handle subfiles' perm events Applying: brlocks/lglocks: cleanups Applying: mm/memory_failure: let the compiler add the function name Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy() Applying: mm/hugetlb.c: use long vars instead of int in region_count() Applying: mm, thp: remove unnecessary ret variable Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd Applying: mm: remove swap token code Applying: mm: vmscan: remove lumpy reclaim Applying: mm: vmscan: do not stall on writeback during memory compaction Applying: mm: vmscan: remove reclaim_mode_t Applying: hugetlb: rename max_hstate to hugetlb_max_hstate Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values Applying: hugetlbfs: add an inline helper for finding hstate index Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2 Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb Applying: hugetlb: simplify migrate_huge_page() Applying: memcg: add HugeTLB extension Applying: memcg-add-hugetlb-extension-fix Applying: memcg-add-hugetlb-extension-fix-fix Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free Applying: memcg: track resource index in cftype private Applying: hugetlbfs: add memcg control files for hugetlbfs Applying: memcg: use scnprintf instead of sprintf Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix Applying: hugetlb: migrate memcg info from oldpage to new page during migration Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2 Applying: memcg: add memory controller documentation for hugetlb management Applying: mm: fix off-by-one bug in print_nodes_state() Applying: mm: use kcalloc() instead of kzalloc() to allocate array Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix Applying: mm/fork: fix overflow in vma length when copying mmap on clone Applying: mm/vmstat.c: remov debug fs entries on failure of file creation and made extfrag_debug_root dentry local Applying: mm: correctly synchronize rss-counters at exit/exec Applying: thp, memcg: split hugepage for memcg oom on cow Applying: mm: do_migrate_pages() calls migrate_to_node() even if task is already on a correct node Applying: mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix Applying: mm: do_migrate_pages(): rename arguments Applying: kernel: cgroup: push rcu read locking from css_is_ancestor() to callsite Applying: mm: memcg: count pte references from every member of the reclaimed hierarchy Applying: mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix Applying: mm: rename is_mlocked_vma() to mlocked_vma_newpage() Applying: mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix Applying: mm, thp: drop page_table_lock to uncharge memcg pages Applying: Documentation: memcg: future proof hierarchical statistics documentation Applying: Cross Memory Attach: make it Kconfigurable Applying: bug: introduce BUILD_BUG_ON_INVALID() macro Applying: bug: completely remove code generated by disabled VM_BUG_ON() Applying: x86: print e820 physical addresses consistently with other parts of kernel Applying: x86: print physical addresses consistently with other parts of kernel Applying: swiotlb: print physical addresses consistently with other parts of kernel Applying: mm: print physical addresses consistently with other parts of kernel Applying: kbuild: install kernel-page-flags.h Applying: tools/vm/page-types.c: cleanups Applying: mm: move is_vma_temporary_stack() declaration to huge_mm.h Applying: memcg: fix/change behavior of shared anon at moving task Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup Applying: memcg swap: use mem_cgroup_uncharge_swap() Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled Applying: mm/memcg: move reclaim_stat into lruvec Applying: mm: push lru index into shrink_[in]active_list() Applying: mm-push-lru-index-into-shrink_active_list-fix Applying: mm: mark mm-inline functions as __always_inline Applying: mm: remove lru type checks from __isolate_lru_page() Applying: mm/memcg: kill mem_cgroup_lru_del() Applying: memcg: mark more functions/variables as static Applying: memcg: remove unused variable Applying: memcg: mark stat field of mem_cgroup struct as __percpu Applying: memcg: remove redundant parentheses Applying: memcg: make threshold index in the right position Applying: memcg: revise the position of threshold index while unregistering event Applying: mm/memcg: use vm_swappiness from target memory cgroup Applying: memcg: add mlock statistic in memory.stat Applying: memcg-add-mlock-statistic-in-memorystat-fix Applying: mm/vmscan: store "priority" in struct scan_control Applying: mm: add link from struct lruvec to struct zone Applying: mm/vmscan: push lruvec pointer into isolate_lru_pages() Applying: mm/vmscan: push zone pointer into shrink_page_list() Applying: mm/vmscan: remove update_isolated_counts() Applying: mm/vmscan: push lruvec pointer into putback_inactive_pages() Applying: mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size() Applying: mm/vmscan: push lruvec pointer into inactive_list_is_low() Applying: mm/vmscan: push lruvec pointer into shrink_list() Applying: mm/vmscan: push lruvec pointer into get_scan_count() Applying: mm/vmscan: push lruvec pointer into should_continue_reclaim() Applying: mm/vmscan: kill struct mem_cgroup_zone Applying: security/keys/keyctl.c: suppress memory allocation failure warning Applying: frv: use set_current_blocked() and block_sigmask() Applying: um/kernel/trap.c: port OOM changes to handle_page_fault() Applying: sgi-xp: use lockdep_assert_held() Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked() Applying: XFS: fix lock ASSERT on UP Applying: mm/huge_memory.c: use lockdep_assert_held() Applying: futex: use lockdep_assert_held() for lock checking Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked() Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use Applying: checkpatch: check for spin_is_locked() Applying: CodingStyle: add kmalloc_array() to memory allocators Applying: parisc: use set_current_blocked() and block_sigmask() Applying: introduce SIZE_MAX Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table Applying: NMI watchdog: fix for lockup detector breakage on resume Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix Applying: watchdog: fix for lockup detector breakage on resume Applying: task_work_add: generic process-context callbacks Applying: genirq: reimplement exit_irq_thread() hook via task_work_add() Applying: hexagon: do_notify_resume() needs tracehook_notify_resume() Applying: keys: change keyctl_session_to_parent() to use task_work_add() Applying: keys: kill the dummy key_replace_session_keyring() Applying: keys: kill task_struct->replacement_session_keyring Applying: kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks Applying: vsprintf: correctly handle width when '#' flag used in %#p format. Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes Applying: vsprintf: further optimize decimal conversion Applying: vsprintf-further-optimize-decimal-conversion-v2 Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes Applying: hamradio/scc: orphan driver in MAINTAINERS Applying: MAINTAINERS: remove Alessandro Applying: blacklight: remove redundant spi driver bus initialization Applying: lcd: add callbacks for early fb event blank support Applying: fbdev: add events for early fb event support Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling Applying: leds: driver for DA9052/53 PMIC v2 Applying: leds-led-module-for-da9052-53-pmic-v2-fix Applying: leds: add LED driver for lm3556 chip Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes Applying: leds: lm3556: don't call kfree for the memory allocated by devm_kzalloc Applying: leds: simple_strtoul() cleanup Applying: leds: Use kcalloc instead of kzalloc to allocate array Applying: leds: add new field to led_classdev struct to save activation state Applying: leds: change existing triggers to use activated flag Applying: leds: change ledtrig-timer to use activated flag Applying: include/linux/led-lm3530.h: comment correction about the range of brightness Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization Applying: leds: heartbeat: stop on shutdown Applying: leds-heartbeat-stop-on-shutdown-v5 Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes Applying: leds: add new transient trigger for one shot timer activation Applying: list_debug: WARN for adding something already in the list Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata Applying: lib/string_helpers.c: make arrays static Applying: lib/bitmap.c: fix documentation for scnprintf() functions Applying: vsprintf: fix %ps on non symbols when using kallsyms Applying: spinlock_debug: print kallsyms name for lock Applying: radix-tree: fix preload vector size Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL> Applying: init: disable sparse checking of the mount.o source files Applying: rtc/spear: add Device Tree probing capability Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver() Applying: rtc: add ioctl to get/clear battery low voltage status Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers" Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix Applying: rtc: ds1307: remove superfluous initialization Applying: rtc: ds1307: add trickle charger support Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF Applying: HPFS: remove PRINTK() macro Applying: kmod: unexport call_usermodehelper_freeinfo() Applying: kmod: convert two call sites to call_usermodehelper_fns() Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers Applying: kmod.c: fix kernel-doc warning Applying: kmod: avoid deadlock from recursive kmod call Applying: cred: remove task_is_dead() from __task_cred() validation Applying: stack usage: add pid to warning printk in check_stack_usage Applying: proc: clean up /proc/<pid>/environ handling Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes Applying: proc: unify ptrace_may_access() locking code Applying: proc: remove mm_for_maps() Applying: proc: use mm_access() instead of ptrace_may_access() Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code Applying: procfs: use more apprioriate types when dumping /proc/N/stat Applying: proc: report file/anon bit in /proc/pid/pagemap Applying: proc/smaps: carefully handle migration entries Applying: proc/smaps: show amount of nonlinear ptes in vma Applying: proc/smaps: show amount of hwpoison pages Applying: proc: use IS_ERR_OR_NULL() Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters Applying: cpu: introduce clear_tasks_mm_cpumask() helper Applying: arm: use clear_tasks_mm_cpumask() Applying: powerpc: use clear_tasks_mm_cpumask() Applying: sh: use clear_tasks_mm_cpumask() Applying: blackfin: a couple of task->mm handling fixes Applying: blackfin: fix possible deadlock in decode_address() Applying: um: should hold tasklist_lock while traversing processes Applying: um: fix possible race on task->mm Applying: um: properly check all process' threads for a live mm Applying: ipc/sem.c: alternatives to preempt_disable() Applying: ipc/mqueue: cleanup definition names and locations Applying: ipc/mqueue: switch back to using non-max values on create Applying: ipc/mqueue: enforce hard limits Applying: ipc/mqueue: update maximums for the mqueue subsystem Applying: ipc/mqueue: using vmalloc requires including vmalloc.h Applying: mqueue: revert bump up DFLT_*MAX Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE Applying: mqueue: separate mqueue default value from maximum value Applying: selftests: add mq_open_tests Applying: ipc/mqueue: improve performance of send/recv Applying: ipc-mqueue-improve-performance-of-send-recv-fix Applying: ipc/mqueue: correct mq_attr_ok test Applying: ipc-mqueue-correct-mq_attr_ok-test-fix Applying: ipc/mqueue: strengthen checks on mqueue creation Applying: ipc-mqueue-strengthen-checks-on-mqueue-creation-fix Applying: tools/selftests: add mq_perf_tests Applying: tools-selftests-add-mq_perf_tests-checkpatch-fixes Applying: rapidio: add DMA engine support for RIO data transfers Applying: rapidio/tsi721: add DMA engine support Applying: eventfd: change int to __u64 in eventfd_signal() Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix Applying: w1: introduce a slave mutex for serializing IO Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector() Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry Applying: c/r: fs, proc: Move children entry back to tid_base_stuff Applying: syscalls, x86: add __NR_kcmp syscall Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries Applying: c/r: prctl: simplify PR_SET_MM on mm::code/data assignment Applying: c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found Applying: c/r: prctl: add ability to set new mm_struct::exe_file Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal Applying: c/r: prctl: add ability to get clear_tid_address Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment Applying: ramoops: use pstore interface Applying: ramoops: fix printk format warnings Applying: kconfig: update compression algorithm info Applying: notify_change(): check that i_mutex is held Merging quilt/akpm (0aa928c notify_change(): check that i_mutex is held) [master ecbec73] Revert "kmsg: export printk records to the /dev/kmsg interface"
Attachment:
pgpBk8qppwx_5.pgp
Description: PGP signature
