* linux-next: Tree for July 25
@ 2008-07-25 7:35 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-25 7:35 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8428 bytes --]
Hi all,
Changes since next-20080724:
Temporarily dropped tree: acpi (it is being moved to a new tree and is
just accumulating conflicts against Linus' tree).
The cris tree is fetchable again.
Linus' tree required a build fix (that has been applied upstream already).
The sched tree lost its conflict.
The ide tree lost its build fix patch.
The inifinband tree gained a conflict against Linus' tree.
The vfs tree gained a conflict against Linus' tree.
The arm tree lost its conflict.
The semaphore tree lost its conflict.
The semaphore-removal tree lost all its conflicts.
The ubifs tree lost all its conflicts.
I have also applied the following patches for known problems:
Move update_mmu_cache() declaration from tlbflush.h to pgtable.h
(a powerpc fix)
The sparc(32) defconfig build fails.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 105 trees (counting Linus' and 14 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
CONFLICT (content): Merge conflict in drivers/dca/dca-sysfs.c
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
CONFLICT (content): Merge conflict in Makefile
CONFLICT (content): Merge conflict in include/Kbuild
Created commit 4dd0ad2: Revert "kconfig: normalize int/hex values"
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
CONFLICT (content): Merge conflict in include/linux/mlx4/qp.h
Merging acpi/test
CONFLICT (rename/modify): Merge conflict in arch/x86/mm/srat_32.c
CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-firmware-acpi
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
CONFLICT (content): Merge conflict in drivers/acpi/executer/exdump.c
CONFLICT (content): Merge conflict in drivers/acpi/hardware/hwgpe.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
CONFLICT (content): Merge conflict in drivers/acpi/system.c
CONFLICT (content): Merge conflict in drivers/acpi/video.c
CONFLICT (content): Merge conflict in drivers/char/apm-emulation.c
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
CONFLICT (add/add): Merge conflict in drivers/misc/compal-laptop.c
CONFLICT (content): Merge conflict in drivers/misc/fujitsu-laptop.c
CONFLICT (content): Merge conflict in drivers/pci/pci.c
CONFLICT (content): Merge conflict in drivers/pci/pci.h
CONFLICT (content): Merge conflict in include/acpi/acconfig.h
CONFLICT (content): Merge conflict in include/acpi/acexcep.h
CONFLICT (content): Merge conflict in include/acpi/acmacros.h
CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h
CONFLICT (content): Merge conflict in include/acpi/actbl1.h
CONFLICT (content): Merge conflict in include/acpi/actypes.h
CONFLICT (content): Merge conflict in include/linux/ioport.h
$ git reset --hard
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (delete/modify): drivers/mtd/maps/mtx-1_flash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/maps/mtx-1_flash.c left in tree.
$ git rm drivers/mtd/maps/mtx-1_flash.c
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/pipe.c
Merging sound/master
Merging arm/devel
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/stop_machine.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Makefile
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in kernel/sysctl.c
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile
CONFLICT (content): Merge conflict in include/Kbuild
CONFLICT (add/add): Merge conflict in include/drm/Kbuild
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Applying Move update_mmu_cache() declaration from tlbflush.h to pgtable.h
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: Tree for July 25
@ 2012-07-25 4:30 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-07-25 4:30 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 43183 bytes --]
Hi all,
Please do not add anything to linux-next included branches/series that is
destined for v3.7 until after v3.6-rc1 is released.
Reminder: do not rebase your branches before asking Linus to pull them ...
Changes since 20120724:
The net-next tree lost its conflicts.
The mfd tree gained a conflict against Linus' tree.
The tip tree lost its conflicts.
The kvm tree lost its conflicts.
The tty tree still has its build failures for which I have disabled 2
staging drivers and applied a patch.
The arm-soc tree lost its conflicts.
I have still reverted 3 commits from the signal tree at the request of the
arm maintainer.
I removed several patches form the akpm tree that no longer apply due to
some commits being removed from the tip tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
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 197 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (f14121a Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1)
Merging arm-current/fixes (ff081e0 ARM: 7457/1: smp: Fix suspicious RCU originating from cpu_die())
Merging m68k-current/for-linus (1525e06 m68k/apollo: Rename "timer" to "apollo_timer")
Merging powerpc-merge/merge (50fb31c tty/hvc_opal: Fix debug function name)
Merging sparc/master (d55de60 sparc64: remove unused function straddles_64bit_va_hole())
Merging net/master (3c4cfad Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging sound-current/for-linus (c1b623d Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
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 (8a70e7f NFC: NCI module license 'unspecified' taints kernel)
Merging driver-core.current/driver-core-linus (84a1caf Linux 3.5-rc7)
Merging tty.current/tty-linus (84a1caf Linux 3.5-rc7)
Merging usb.current/usb-linus (84a1caf Linux 3.5-rc7)
Merging staging.current/staging-linus (6887a41 Linux 3.5-rc5)
Merging char-misc.current/char-misc-linus (84a1caf Linux 3.5-rc7)
Merging input-current/for-linus (e76b8ee Input: xpad - add Andamiro Pump It Up pad)
Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (c475c06 hwrng: atmel-rng - fix data valid check)
Merging ide/master (39a50b4 Merge branch 'hfsplus')
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 arm/for-next (dea2ea3 Merge branches 'audit', 'delay', 'dmaengine', 'fixes', 'misc' and 'sta2x11' into for-next)
Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (719154c bf60x: fix build warning)
Merging c6x/for-linux-next (b9b8722 C6X: clean up compiler warning)
Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (e9c31b3 debug: Do not permit CONFIG_DEBUG_STACK_USAGE=y on IA64 or PARISC)
Merging m68k/for-next (1525e06 m68k/apollo: Rename "timer" to "apollo_timer")
Merging m68knommu/for-next (b1f7735 m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs)
Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
Merging mips/mips-for-linux-next (8bc4a1a Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (4c01acc [PARISC] fix code to find libgcc)
Merging powerpc/next (574ce79 powerpc/mpic: Create a revmap with enough entries for IPIs and timers)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (9082d70 powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz)
Merging s390/features (27f6b41 s390/vtimer: rework virtual timer interface)
Merging sh/sh-latest (9ff561f Merge branch 'common/pinctrl' into sh-latest)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (f6d2ce0 tile: updates to pci root complex from community feedback)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging ceph/master (26ce171 libceph: fix NULL dereference in reset_connection())
CONFLICT (content): Merge conflict in net/ceph/osd_client.c
CONFLICT (content): Merge conflict in net/ceph/messenger.c
Merging cifs/for-next (29e20f9 CIFS: Make CAP_* checks protocol independent)
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 (5f5b331 eCryptfs: check for eCryptfs cipher support at mount)
Merging ext3/for_next (0143fc5 udf: avoid info leak on export)
Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail to claim space)
Merging fuse/for-next (f3840dc fuse: add missing INIT flag descriptions)
Merging gfs2/master (15e1c96 GFS2: Eliminate 64-bit divides)
Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio)
Merging nfs/linux-next (4886e15 Merge branch 'nfs-for-3.6' into linux-next)
Merging nfsd/nfsd-next (200724a SUNRPC/cache: fix reporting of expired cache entries in 'content' file.)
Merging ocfs2/linux-next (2dfd060 aio: make kiocb->private NUll in init_sync_kiocb())
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 (5fcb08b 9p: BUG before corrupting memory)
Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable)
Merging xfs/for-next (824c313 xfs: remove xfs_ialloc_find_free)
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_priv.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_log.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c
Merging vfs/for-next (8cae6f7 ext4: switch EXT4_IOC_RESIZE_FS to mnt_want_write_file())
Merging pci/next (63b96f7 Merge branch 'pci/yinghai-pciehp-unused' into next)
Merging hid/for-next (6a2ef9e Merge branch 'upstream' into for-next)
Merging quilt/i2c (d4dd03a i2c-omap: Add support for I2C_M_STOP message flag)
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 (5db20c4 Revert "i2c: tegra: convert normal suspend/resume to *_noirq")
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-nomadik.c
Merging quilt/jdelvare-hwmon (3eae00e hwmon: struct x86_cpu_id arrays can be __initconst)
Merging hwmon-staging/hwmon-next (e30bca1 hwmon: (applesmc) Ignore some temperature registers)
Merging v4l-dvb/master (07c4a1e Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Applying: Use a named union in struct v4l2_ioctl_info
Merging kbuild/for-next (3cd44c2 Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (4503379 localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG)
Merging libata/NEXT (ee32108 libata-acpi: add missing inlines in libata.h)
Applying: libata-acpi: fix up for acpi_pm_device_sleep_state API change
Merging infiniband/for-next (4c1bee0 Merge branch 'qib' into for-next)
Merging acpi/next (2eb119f Merge branch 'red-hat-bz-772730' into next)
CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
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 ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute)
Merging ubi/linux-next (87e773c UBI: harmonize the update of ubi->beb_rsvd_pebs)
Merging dlm/next (96006ea dlm: fix missing dir remove)
Merging scsi/for-next (b49951e [SCSI] isci: implement suspend/resume support)
CONFLICT (content): Merge conflict in include/scsi/scsi_device.h
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct file usage for iSCSI/SCTP)
Merging target-merge/for-next-merge (5061731 tcm_vhost: Initial merge for vhost level target fabric driver)
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 (6343325 dmaengine: Cleanup logging messages)
CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (content): Merge conflict in drivers/dma/Kconfig
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (3c4cfad Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging wireless-next/master (36eb22e libertas: firmware.c: remove duplicated include)
Merging bluetooth/master (2b1f926 Bluetooth: Make connect / disconnect cfm functions return void)
Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032)
Merging l2-mtd/master (cd0a30d mtd: m25p80: Fix the Spansion chip detection)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx6q.c
Merging crypto/master (a434788 crypto: twofish-avx - remove useless instruction)
Merging drm/drm-next (b97ce28 drm/ttm: remove stale declaration and field)
CONFLICT (content): Merge conflict in include/linux/pci_regs.h
Merging sound/for-next (c1b623d Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
Merging sound-asoc/for-next (b817662 ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs)
Merging quilt/rr (befbe03 cpumask: cpulist_parse() comments correction)
Merging input/next (07b8481 Input: add MELFAS mms114 touchscreen driver)
Merging input-mt/for-next (c45361a Revert "Input: atmel_mxt_ts - warn if sysfs could not be created")
Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
Merging block/for-next (f45d342 Merge branch 'for-linus' into for-next)
Merging quilt/device-mapper (51a1b23 Add read-only and fail-io modes to thin provisioning.)
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 (30b87c6 mmc: sdhci-dove: Prepare for common clock framework)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (44a8bde slob: Fix early boot kernel crash)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (cd853a6 md: avoid taking the mutex on some ioctls.)
Merging mfd/for-next (78948c1 mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ)
CONFLICT (modify/delete): include/linux/mfd/s5m87xx/s5m-core.h deleted in mfd/for-next and modified in HEAD. Version HEAD of include/linux/mfd/s5m87xx/s5m-core.h left in tree.
CONFLICT (content): Merge conflict in drivers/regulator/s5m8767.c
CONFLICT (content): Merge conflict in drivers/mfd/mc13xxx-spi.c
CONFLICT (content): Merge conflict in arch/arm/configs/tegra_defconfig
$ git rm -f include/linux/mfd/s5m87xx/s5m-core.h
Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries)
Applying: ACPI-Thermal: fix for an API change
Merging fbdev/fbdev-next (6fcdbc0 s3fb: Add Virge/MX (86C260))
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parameters" from Archit)
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/core.c
Merging regulator/for-next (3384fb9 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (6637284 Smack: Maintainer Record)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (ebb4679 watchdog: fix watchdog-test.c build warning)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (395e51f Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next)
Merging vfio/next (ed9e8e9 vfio: Add PCI device driver)
Merging osd/linux-next (a7fdf6a exofs: stop using s_dirt)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (a58b3a4 Fix typo in include/linux/clk.h .)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (26ba678 Merge branch 'master' into linux-next)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (e95d8aa of: mtd: nuke useless const qualifier)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (8ceffa7 spi/orion: remove uneeded spi_info)
Merging tip/auto-latest (c05bf57 Merge branch 'timers/urgent')
Merging rcu/rcu/next (5cf05ad rcu: Fix broken strings in RCU's source code.)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (1a577b7 KVM: fix race with level interrupts)
Merging kvm-ppc/kvm-ppc-next (1ee245b KVM: PPC: Critical interrupt emulation support)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/booke_interrupts.S
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 (64b0a47 Merge commit 'v3.5-rc7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (6fec10a workqueue: fix spurious CPU locality WARN from process_one_work())
Merging drivers-x86/linux-next (3fc1ae3 ACER: Add support for accelerometer sensor)
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 (38e2319 Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (b54cf35 LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS)
Merging driver-core/driver-core-next (6791457 printk: Export struct log size and member offsets through vmcoreinfo)
Merging tty/tty-next (373f5ae pcmcia,synclink_cs: fix termios port I missed)
Applying: disable SERIAL_IPOCTAL broken by tty updates
Applying: disable USB_SERIAL_QUATECH2 broken by tty update
Applying: tty: fix up usb serial console for termios change.
Merging usb/usb-next (e387ef5 usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams)
CONFLICT (content): Merge conflict in include/scsi/scsi_device.h
Merging staging/staging-next (419e926 staging: csr: delete a bunch of unused library functions)
CONFLICT (content): Merge conflict in drivers/staging/gdm72xx/netlink_k.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/s626.h
Merging char-misc/char-misc-next (6078188 mei: use module_pci_driver)
Merging tmem/linux-next (78821b2 Merge branch 'stable/for-linus-3.6' into linux-next)
Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
CONFLICT (content): Merge conflict in fs/sync.c
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 (8b8b091 pinctrl: Add one-register-per-pin type device tree based pinctrl driver)
Merging moduleh/for-sfr (6b16351 Linux 3.5-rc4)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging kmap_atomic/kmap_atomic (2164d33 pipe: remove KM_USER0 from comments)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
Merging irqdomain/irqdomain/next (94f036a irqdomain: eliminate slow-path revmap lookups)
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
Merging gpio-lw/for-next (4fbb002 gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
Merging arm-soc/for-next (1635c0a Merge branch 'late/warnings' into for-next)
Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board)
Merging s5p/for-next (6701bca Merge branch 'next/board-samsung-3' into for-next)
Merging tegra/for-next (a04ef1f Merge branch 'for-3.6/defconfig' into for-next)
Merging kvmtool/master (8598de5 kvm tools, powerpc: Use MMU info for ibm,slb-size)
Merging dma-mapping/dma-mapping-next (471e588 ARM: dma-mapping: fix build break on no-MMU platform)
Merging pwm/for-next (d295b12 pwm: fix used-uninitialized warning in pwm_get())
CONFLICT (content): Merge conflict in drivers/pwm/pwm-samsung.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt-tegra30.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt-tegra20.c
Merging dma-buf/for-next (ca24a14 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function")
CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK)
CONFLICT (content): Merge conflict in drivers/clk/Makefile
Merging random/dev (d114a33 dmi: Feed DMI table to /dev/random driver)
CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c
CONFLICT (content): Merge conflict in drivers/mfd/ab3100-core.c
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: mm: fix wrong argument of migrate_huge_pages() in soft_offline_huge_page()
Applying: pcdp: use early_ioremap/early_iounmap to access pcdp table
Applying: cciss: fix incorrect scsi status reporting
Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
Applying: acpi_memhotplug.c: remove memory info from list before freeing it
Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
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/cpu/perf_event_intel_uncore.h: make UNCORE_PMU_HRTIMER_INTERVAL 64-bit
Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
Applying: prctl: remove redunant assignment of "error" to zero
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: thermal: fix potential out-of-bounds memory access
Applying: thermal: add Renesas R-Car thermal sensor support
Applying: thermal: add generic cpufreq cooling implementation
Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory
Applying: thermal: exynos5: add exynos5 thermal sensor driver support
Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer
Applying: ARM: exynos: add thermal sensor driver platform data support
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
Applying: fs/xattr.c:getxattr(): improve handling of allocation failures
Applying: fs: make dumpable=2 require fully qualified path
Applying: coredump: warn about unsafe suid_dumpable / core_pattern combo
Applying: xtensa/mm/fault.c: port OOM changes to do_page_fault
Applying: mm/slab: remove duplicate check
Applying: slab: do not call compound_head() in page_get_cache()
Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next()
Applying: mm: make vb_alloc() more foolproof
Applying: mm-make-vb_alloc-more-foolproof-fix
Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP
Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON
Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE
Applying: swap: allow swap readahead to be merged
Applying: documentation: update how page-cluster affects swap I/O
Applying: mm: account the total_vm in the vm_stat_account()
Applying: mm/buddy: cleanup on should_fail_alloc_page
Applying: mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlb: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlb: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: hugetlb: add a list for tracking in-use HugeTLB pages
Applying: hugetlb: make some static variables global
Applying: hugeltb: mark hugelb_max_hstate __read_mostly
Applying: mm/hugetlb: add new HugeTLB cgroup
Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix
Applying: mm-hugetlb-add-new-hugetlb-cgroup-fix-fix
Applying: hugetlb/cgroup: remove unnecessary NULL checks
Applying: hugetlb/cgroup: Mark root_h_cgroup static
Applying: hugetlb/cgroup: add the cgroup pointer to page lru
Applying: hugetlb/cgroup: add charge/uncharge routines for hugetlb cgroup
Applying: hugetlb/cgroup: Remove unnecessary NULL checks
Applying: mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge
Applying: hugetlb/cgroup: add support for cgroup removal
Applying: hugetlb/cgroup: add hugetlb cgroup control files
Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix
Applying: hugetlb-cgroup-add-hugetlb-cgroup-control-files-fix-fix
Applying: hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
Applying: hugetlb/cgroup: add HugeTLB controller documentation
Applying: hugetlb: move all the in use pages to active list
Applying: hugetlb/cgroup: assign the page hugetlb cgroup when we move the page to active list.
Applying: hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate
Applying: mm, oom: do not schedule if current has been killed
Applying: mm/memblock.c:memblock_double_array(): cosmetic cleanups
Applying: memcg: remove check for signal_pending() during rmdir()
Applying: memcg: clean up force_empty_list() return value check
Applying: memcg: mem_cgroup_move_parent() doesn't need gfp_mask
Applying: memcg: make mem_cgroup_force_empty_list() return bool
Applying: memcg-make-mem_cgroup_force_empty_list-return-bool-fix
Applying: mm/compaction: cleanup on compaction_deferred
Applying: mm, fadvise: don't return -EINVAL when filesystem cannot implement fadvise()
Applying: mm-fadvise-dont-return-einval-when-filesystem-cannot-implement-fadvise-checkpatch-fixes
Applying: mm: clear pages_scanned only if draining a pcp adds pages to the buddy allocator again
Applying: mm, oom: fix potential killing of thread that is disabled from oom killing
Applying: mm, oom: replace some information in tasklist dump
Applying: mm: do not use page_count() without a page pin
Applying: mm: clean up __count_immobile_pages()
Applying: memcg: rename config variables
Applying: memcg-rename-config-variables-fix
Applying: memcg-rename-config-variables-fix-fix
Applying: mm: remove unused LRU_ALL_EVICTABLE
Applying: memcg: fix bad behavior in use_hierarchy file
Applying: memcg: rename mem_control_xxx to memcg_xxx
Applying: mm: have order > 0 compaction start off where it left
Applying: mm-have-order-0-compaction-start-off-where-it-left-checkpatch-fixes
Applying: mm: have order > 0 compaction start off where it left
Applying: mm-have-order-0-compaction-start-off-where-it-left-v3-typo
Applying: mm: CONFIG_HAVE_MEMBLOCK_NODE -> CONFIG_HAVE_MEMBLOCK_NODE_MAP
Applying: vmscan: remove obsolete shrink_control comment
Applying: mm/memory.c:print_vma_addr(): call up_read(&mm->mmap_sem) directly
Applying: mm: setup pageblock_order before it's used by sparsemem
Applying: mm/memcg: complete documentation for tcp memcg files
Applying: mm/memcg: mem_cgroup_relize_xxx_limit can guarantee memcg->res.limit <= memcg->memsw.limit
Applying: mm/memcg: replace inexistence move_lock_page_cgroup() by move_lock_mem_cgroup() in comment
Applying: mm/hotplug: correctly setup fallback zonelists when creating new pgdat
Applying: mm/hotplug: correctly add new zone to all other nodes' zone lists
Applying: mm/hotplug: free zone->pageset when a zone becomes empty
Applying: mm/hotplug: mark memory hotplug code in page_alloc.c as __meminit
Applying: mm, oom: move declaration for mem_cgroup_out_of_memory to oom.h
Applying: mm, oom: introduce helper function to process threads during scan
Applying: mm, memcg: introduce own oom handler to iterate only over its own threads
Applying: mm, oom: reduce dependency on tasklist_lock
Applying: mm, oom: reduce dependency on tasklist_lock: fix
Applying: mm, memcg: move all oom handling to memcontrol.c
Applying: mm: factor out memory isolate functions
Applying: mm: fix free page check in zone_watermark_ok()
Applying: memory-hotplug: fix kswapd looping forever problem
Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix
Applying: memory-hotplug-fix-kswapd-looping-forever-problem-fix-fix
Applying: mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages
Applying: mm: slub: optimise the SLUB fast path to avoid pfmemalloc checks
Applying: mm: introduce __GFP_MEMALLOC to allow access to emergency reserves
Applying: mm: allow PF_MEMALLOC from softirq context
Applying: mm: only set page->pfmemalloc when ALLOC_NO_WATERMARKS was used
Applying: mm: ignore mempolicies when using ALLOC_NO_WATERMARK
Applying: net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on the individual socket
Applying: netvm: allow the use of __GFP_MEMALLOC by specific sockets
Applying: netvm: allow skb allocation to use PFMEMALLOC reserves
Applying: netvm: propagate page->pfmemalloc to skb
Applying: netvm: propagate page->pfmemalloc from skb_alloc_page to skb
Applying: netvm-propagate-page-pfmemalloc-from-skb_alloc_page-to-skb-fix
Applying: netvm: set PF_MEMALLOC as appropriate during SKB processing
Applying: mm: micro-optimise slab to avoid a function call
Applying: nbd: set SOCK_MEMALLOC for access to PFMEMALLOC reserves
Applying: mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage
Applying: mm: account for the number of times direct reclaimers get throttled
Applying: netvm: prevent a stream-specific deadlock
Applying: selinux: tag avc cache alloc as non-critical
Applying: mm: methods for teaching filesystems about PG_swapcache pages
Applying: mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages
Applying: mm: swap: implement generic handler for swap_activate
Applying: mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
Applying: mm: add support for direct_IO to highmem pages
Applying: nfs: teach the NFS client how to treat PG_swapcache pages
Applying: nfs: disable data cache revalidation for swapfiles
Applying: nfs: enable swap on NFS
Applying: nfs: prevent page allocator recursions with swap over NFS.
Applying: swapfile: avoid dereferencing bd_disk during swap_entry_free for network storage
Applying: mm: swapfile: clean up unuse_pte race handling
Applying: mm: memcg: move swapin charge functions above callsites
Applying: mm: memcg: split swapin charge function into private and public part
Applying: mm: memcg: only check swap cache pages for repeated charging
Applying: mm: memcg: only check anon swapin page charges for swap cache
Applying: mm: mmu_notifier: fix freed page still mapped in secondary MMU
Applying: memcg: prevent OOM with too many dirty pages
Applying: memcg: further prevent OOM with too many dirty pages
Applying: memcg: add mem_cgroup_from_css() helper
Applying: memcg-add-mem_cgroup_from_css-helper-fix
Applying: shmem: provide vm_ops when also providing a mem policy
Applying: tmpfs: interleave the starting node of /dev/shmem
Applying: frv: kill used but uninitialized variable
Applying: alpha: remove mysterious if zero-ed out includes
Applying: avr32/mm/fault.c: port OOM changes to do_page_fault
Applying: avr32-mm-faultc-port-oom-changes-to-do_page_fault-fix
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n
Applying: clk: validate pointer in __clk_disable()
Applying: panic: fix a possible deadlock in panic()
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: kernel/sys.c: avoid argv_free(NULL)
Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure
Applying: printk: add generic functions to find KERN_<LEVEL> headers
Applying: printk-add-generic-functions-to-find-kern_level-headers-fix
Applying: printk: add kern_levels.h to make KERN_<LEVEL> available for asm use
Applying: arch: remove direct definitions of KERN_<LEVEL> uses
Applying: btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout
Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix
Applying: btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes
Applying: sound: use printk_get_level and printk_skip_level
Applying: printk: convert the format for KERN_<LEVEL> to a 2 byte pattern
Applying: printk: only look for prefix levels in kernel messages
Applying: printk: remove the now unnecessary "C" annotation for KERN_CONT
Applying: vsprintf: add %pMR for Bluetooth MAC address
Applying: Documentation/printk-formats.txt: add description for %pMR
Applying: lib/vsprintf.c: remind people to update Documentation/printk-formats.txt when adding printk formats
Applying: lib/vsprintf.c: kptr_restrict: fix pK-error in SysRq show-all-timers(Q)
Applying: MAINTAINERS: update EXYNOS DP DRIVER F: patterns
Applying: drivers/video/backlight/atmel-pwm-bl.c: use devm_ functions
Applying: drivers/video/backlight/ot200_bl.c: use devm_ functions
Applying: drivers/video/backlight/lm3533_bl.c: use devm_ functions
Applying: backlight: atmel-pwm-bl: use devm_gpio_request()
Applying: backlight: ot200_bl: use devm_gpio_request()
Applying: backlight: tosa_lcd: use devm_gpio_request()
Applying: backlight: tosa_bl: use devm_gpio_request()
Applying: backlight: lms283gf05: use devm_gpio_request()
Applying: backlight: corgi_lcd: use devm_gpio_request()
Applying: backlight: l4f00242t03: export and use devm_gpio_request_one()
Applying: backlight: move register definitions from header to source
Applying: backlight: move lp855x header into platform_data directory
Applying: string: introduce memweight()
Applying: string-introduce-memweight-fix
Applying: string: fix build error caused by memweight() introduction
Applying: qnx4fs: use memweight()
Applying: dm: use memweight()
Applying: affs: use memweight()
Applying: video/uvc: use memweight()
Applying: ocfs2: use memweight()
Applying: ext2: use memweight()
Applying: ext3: use memweight()
Applying: ext4: use memweight()
Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
Applying: rbtree: empty nodes have no color
Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
Applying: rbtree: performance and correctness test
Applying: rbtree: break out of rb_insert_color loop after tree rotation
Applying: rbtree: adjust root color in rb_insert_color() only when necessary
Applying: rbtree: low level optimizations in rb_insert_color()
Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
Applying: rbtree: optimize case selection logic in __rb_erase_color()
Applying: rbtree: low level optimizations in __rb_erase_color()
Applying: rbtree: coding style adjustments
Applying: rbtree: rb_erase updates and comments
Applying: rbtree: optimize fetching of sibling node
Applying: atomic64_test: simplify the #ifdef for atomic64_dec_if_positive() test
Applying: checkpatch: Update alignment check
Applying: checkpatch: test for non-standard signatures
Applying: checkpatch: check usleep_range() arguments
Applying: checkpatch: Add acheck for use of sizeof without parenthesis
Applying: checkpatch-add-check-for-use-of-sizeof-without-parenthesis-v2
Applying: checkpatch: add checks for do {} while (0) macro misuses
Applying: nsproxy: move free_nsproxy() out of do_exit() path
Applying: drivers/message/i2o/i2o_proc.c: the pointer returned from chtostr() points to an array which is no longer valid
Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare/unprepare
Applying: drivers/rtc/rtc-coh901331.c: use devm allocation
Applying: rtc: pl031: encapsulate per-vendor ops
Applying: rtc: pl031: use per-vendor variables for special init
Applying: rtc: pl031: fix up IRQ flags
Applying: drivers/rtc/rtc-ab8500.c: use UIE emulation
Applying: drivers-rtc-rtc-ab8500c-use-uie-emulation-checkpatch-fixes
Applying: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version
Applying: drivers/rtc/rtc-r9701.c: avoid second call to rtc_valid_tm()
Applying: drivers/rtc/rtc-r9701.c: check that r9701_set_datetime() succeeded
Applying: drivers/rtc/rtc-s3c.c: replace #include header files from asm/* to linux/*
Applying: rtc/mc13xxx: use MODULE_DEVICE_TABLE instead of MODULE_ALIAS
Applying: rtc/mc13xxx: add support for the rtc in the mc34708 pmic
Applying: rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails
Applying: rtc/rtc-88pm80x: remove unneed devm_kfree
Applying: rtc/rtc-da9052: remove unneed devm_kfree call
Applying: nilfs2: add omitted comment for ns_mount_state field of the_nilfs structure
Applying: nilfs2: remove references to long gone super operations
Applying: nilfs2: fix timing issue between rmcp and chcp ioctls
Applying: nilfs2: fix deadlock issue between chcp and thaw ioctls
Applying: nilfs2: add omitted comments for structures in nilfs2_fs.h
Applying: nilfs2: add omitted comments for different structures in driver implementation
Applying: hfsplus: use -ENOMEM when kzalloc() fails
Applying: fat: accessors for msdos_dir_entry 'start' fields
Applying: fat: Refactor shortname parsing
Applying: fat (exportfs): move NFS support code
Applying: fat (exportfs): fix dentry reconnection
Applying: kernel/kmod.c: document call_usermodehelper_fns() a bit
Applying: kmod: avoid deadlock from recursive kmod call
Applying: coredump: fix wrong comments on core limits of pipe coredump case
Applying: fork: use vma_pages() to simplify the code
Applying: fork-use-vma_pages-to-simplify-the-code-fix
Applying: revert "sched: Fix fork() error path to not crash"
Applying: fork: fix error handling in dup_task()
Applying: kdump: append newline to the last lien of vmcoreinfo note
Applying: ipc: add COMPAT_SHMLBA support
Applying: ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
Applying: ipc: compat: use signed size_t types for msgsnd and msgrcv
Applying: ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: sysctl: suppress kmemleak messages
Applying: pps: return PTR_ERR on error in device_create
Applying: fs: cachefiles: add support for large files in filesystem caching
Applying: include/linux/aio.h: cpp->C conversions
Applying: resource: make sure requested range is included in the root range
Applying: c/r: fcntl: add F_GETOWNER_UIDS option
Applying: fault-injection: notifier error injection
Applying: notifier error injection documentation
Applying: cpu: rewrite cpu-notifier-error-inject module
Applying: PM: PM notifier error injection module
Applying: memory: memory notifier error injection module
Applying: notifier error injection: fix copy-and-paste error in Kconfig help
Applying: powerpc: pSeries reconfig notifier error injection module
Applying: fault-injection: add selftests for cpu and memory hotplug
Applying: fault-injection: add tool to run command with failslab or fail_page_alloc
Applying: fault-injection: mention failcmd.sh tool in document
Applying: lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
Merging quilt/akpm (f76242e lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table())
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: Tree for July 25
@ 2011-07-25 6:25 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-07-25 6:25 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 24169 bytes --]
Hi all,
[The kernel.org mirroring is being slow today ...]
The powerpc allyesconfig build (at least) still fails today.
Changes since 20110722:
New tree: iscsi-target
Dropped tree: iscsi-target
Linus' tree gained a build failure for which I applied a patch.
The vfs tree lost its conflicts.
The of_pci tree lost its conflict.
The jdelvare-hwmon tree lost its conflict.
The libata tree lost its conflict.
The iscsi-target tree gained a build failure so I dropped it for today.
The slave-dma tree lost its conflict.
The net tree lost its conflicts.
The device-mapper tree gained a build failure which I have just left for
today.
The security-testing tree lost its build failure.
The tip tree lost its conflicts.
The ptrace tree lost its conflict.
The staging tree still has its build failure and gained another for which
I applied a patch.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 199 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Applying: gma500: udlay(20000) is too large
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/proc-fns.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
Merging arm-soc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/pm.c
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci-bridge.h
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx1.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx21.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx25.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx27.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx31.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx35.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-smdkc210.c
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
CONFLICT (delete/modify): arch/m68k/kernel/module_mm.c deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/kernel/module_mm.c left in tree.
CONFLICT (delete/modify): arch/m68k/kernel/module_no.c deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/kernel/module_no.c left in tree.
$ git rm -f arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c
Applying: modules/m68k: make arch's use default loader hooks
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in drivers/Kconfig
CONFLICT (content): Merge conflict in drivers/Makefile
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/ceph/export.c
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
CONFLICT (content): Merge conflict in fs/ext3/fsync.c
Merging ext4/dev
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Applying: vfs/ext4: merge fixup for moved function
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Applying: vfs/nfs: fixup for nfs_open_context change
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/ia64/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in lib/Makefile
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
$ git reset --hard HEAD^
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig
CONFLICT (content): Merge conflict in drivers/cpufreq/Makefile
Merging quilt/rr
CONFLICT (delete/modify): arch/m68k/kernel/module_mm.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/m68k/kernel/module_mm.c left in tree.
CONFLICT (delete/modify): arch/m68k/kernel/module_no.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/m68k/kernel/module_no.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/lguest/i386_head.S
$ git rm -f arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
CONFLICT (content): Merge conflict in drivers/net/r8169.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging staging/staging-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in drivers/staging/bcm/headers.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (delete/modify): drivers/staging/brcm80211/brcmfmac/wl_iw.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmfmac/wl_iw.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/et131x/et131x_netdev.c
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/r8192E.h
CONFLICT (content): Merge conflict in drivers/staging/tm6000/tm6000-alsa.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
$ git rm -f drivers/staging/brcm80211/brcmfmac/wl_iw.c
Applying: gma500: udelay(20000) it too long again
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in mm/filemap.c
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: During allocator-intensive workloads, kswapd will be woken frequently
Applying: During allocator-intensive workloads, kswapd will be woken frequently
CONFLICT (content): Merge conflict in mm/vmscan.c
Applying: When deciding if kswapd is sleeping prematurely, the classzone is taken
Applying: During allocator-intensive workloads, kswapd will be woken frequently
Applying: __tlb_remove_page() switches to a new batch page, but still checks space
Applying: Now, in mem_cgroup_hierarchical_reclaim(), mem_cgroup_local_usage() is
CONFLICT (content): Merge conflict in mm/memcontrol.c
Applying: ERROR: code indent should use tabs where possible
Applying: fix kerneldoc layout
Applying: memcg-fix-reclaimable-lru-check-in-memcg.patch
Applying: commit 889976dbcb12 ("memcg: reclaim memory from nodes in round-robin
CONFLICT (content): Merge conflict in mm/memcontrol.c
Applying: attempt to repair code layout
Applying: Currently we are keeping faulted page locked throughout whole __do_fault
Applying: fix code layout
Applying: This fixes a regression in 3.0 reported by Paul Parsons regarding the
CONFLICT (content): Merge conflict in drivers/w1/masters/ds1wm.c
Applying: ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
Applying: remap_pfn_range() means map physical address pfn<<PAGE_SHIFT to user addr.
CONFLICT (content): Merge conflict in mm/nommu.c
Applying: Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Applying: This driver handles the variants pca9530-pca9533, so it chose the name
Applying: Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Applying: Prevent an arbitrary kernel read. Check the user pointer with access_ok()
Applying: s/EIO/EFAULT/
Applying: The often-NULL data arg to read_cache_page() and read_mapping_page()
Applying: Correct comment on truncate_inode_pages*() in linux/mm.h; and remove
Applying: Use consistent variable names in truncate_pagecache(), truncate_setsize(),
CONFLICT (content): Merge conflict in mm/truncate.c
Applying: Use consistent variable names in truncate_pagecache(), truncate_setsize(),
Applying: Make the pagevec_lookup loops in truncate_inode_pages_range(),
Applying: truncate_inode_pages_range()'s final loop has a nice pincer property,
Applying: 2.6.36's 7e496299d4d2 ("tmpfs: make tmpfs scalable with percpu_counter for
Applying: If dmi_get_system_info() returns NULL, pch_phub_probe() will dereferencea
Applying: Vito said:
Applying: I came across a memory leak during a cyclic cpu-online-offline test.
Applying: kernel/fork.c:267: error: implicit declaration of function
Applying: WARNING: line over 80 characters
Applying: arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function)
Applying: arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl'
Applying: arch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init'
Applying: This reverts my commit a3d77411e8b2ad ("dell-laptop: Toggle the
Applying: There's a code path in pmcraid that can be reached via device ioctl that
Applying: The out_msi_disable label should be before cleanup_nomem to additionally
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t'
Applying: It's about time to revert 16d752397301b9 ("thermal: Create
Applying: We'll soon need to reuse it.
Applying: THERMAL_HWMON is implemented inside the thermal_sys driver and has no
Applying: b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of
Applying: Linux supports some optional features, but it should notify the BIOS about
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: - remove commented-out code
Applying: There was one code block that I commented to be able to test the patch dnd
Applying: With a non-constant 8-bit argument, a call to udelay() generates a warning:
CONFLICT (content): Merge conflict in arch/x86/include/asm/delay.h
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: In response to new device tree code in the kernel, OLPC will start using
Applying: Move these definitions into the relevant header file. This was requested
Applying: Based on earlier review comments, we'll no longer try to stick all of our
Applying: Add code needed for basic suspend/resume of the XO-1 laptop. Based on
Applying: The System Control Interrupt is used in the OLPC XO-1 to control various
Applying: Update the EC SCI masks with recent additions.
Applying: The EC in the OLPC XO-1 delivers GPE events to provide various
Applying: Configure the XO-1's lid switch GPIO to trigger an SCI interrupt, and
Applying: EC events indicate change in AC power connectivity, battery state of
Applying: Add a driver to configure the XO-1 RTC via CS5536 MSRs, to be used as a
Applying: Add a driver for the ACPI-based EC event interface found on the OLPC
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: The buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used
Applying: The address limit is already set in flush_old_exec() so this
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: When 1280x1024@75Hz mode is set, console palette is not set properly -
Applying: Unless I'm very much missing something these tests are intended to check
Applying: The address limit is already set in flush_old_exec() so this
Applying: When IKCONFIG is built-in, make oldconfig will cause the kernel to be
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() via set_fs(USER_DS)
Applying: The address limit is already set in flush_old_exec() so this
Applying: Mike McLagan hasn't contributed in many years and his email bounces.
Applying: Addresses https://bugzilla.kernel.org/show_bug.cgi?id=38862
CONFLICT (content): Merge conflict in drivers/net/skge.c
Applying: - Fix checking of wrong return value for backlight_device_register()
Applying: Add the ams369fg06 amoled panel driver. The ams369fg06 amoled panel (480
Applying: backlight: make some varibales static
Applying: unregister backlight device when unloading the module
Applying: Fix section mismatch warning by adding the correct annotation __devinit
Applying: It's only used in ams369fg06.c, no need for it to be in the global namespace.
Applying: Since commit a19a6ee "backlight: Allow properties to be passed at
Applying: backlight_device_register() returns ERR_PTR() on error.
Applying: 1. current implementation tests wrong value for setting aat2870_bl->max_current.
Applying: i386 allmodconfig:
Applying: Not all systems expose a firmware or platform mechanism for changing the
Applying: The Apple MBP model 6.2 (and maybe other recent MBPs) uses an Apple
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: When hot-plugging a root bridge, we always prevent assigning a bus number
Applying: fix comment layout
Applying: Aside of the usual motivation for constification, this function has a
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: Remove the (unsigned long long) cast in diskstats_show() and adjusts the
Applying: Fix the loopback device to emit a uevent on auto release. The loopback
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: x86_64 allmodconfig:
Applying: x86_64 allmodconfig:
Applying: alpha allmodconfig:
Applying: alpha allmodconfig:
Applying: alpha allmodconfig:
Applying: Cc: Greg KH <greg@kroah.com>
Applying: Use the nice enumerated constant.
Applying: There is no need to define VM_{STACK,DATA}_DEFAULT_FLAGS as variable.
Applying: The address limit is already set in flush_old_exec() so this
Applying: Both sys-i386 and sys-x86_64 support now ndelay(). The delay functions
Applying: When UML is compiled with _FORTIFY_SOURCE we have to export all _chk()
Applying: To make netconsole usable on UML, its ethernet driver needs netpoll
Applying: commit 0954828fcbf3bd13d593499b16b901a4e801b0b9 ("kconfig: replace
Applying: We presently define all kinds of notifiers in notifier.h. This is not
Applying: It is not necessary to share the same notifier.h.
Applying: It is not necessary to share the same notifier.h.
Applying: With this patch applied, make allyesconfig succeeds on ppc64.
Applying: It is not necessary to share the same notifier.h.
Applying: Cc: David Miller <davem@davemloft.net>
Applying: It is not necessary to share the same notifier.h.
Applying: If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has
Applying: For each CPU, do the calibration delay only once. For subsequent calls,
Applying: make cpu_loops_per_jiffy static
Applying: Cc: Andrew Worsley <amworsley@gmail.com>
Applying: prevent ARM build breakage :)
Applying: fix things up after upstream rmk changes
Applying: MPC5200B contains a limited version of RTC from MPC5121. Add support for
Applying: Add support for clock gating. Power consumption can be reduced by setting
Applying: Add support for PMIC8xxx based RTC. PMIC8xxx is Qualcomm's power
Applying: cosmetic tweaks
Applying: Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Applying: We forget to save the return value of the call to
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-25 4:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-25 7:35 linux-next: Tree for July 25 Stephen Rothwell
2011-07-25 6:25 Stephen Rothwell
2012-07-25 4:30 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).