* linux-next: manual merge of the input tree with the s5p tree
From: Stephen Rothwell @ 2011-11-11 2:11 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
drivers/input/keyboard/samsung-keypad.c between commit 532f74540134
("input: samsung-keypad: Add device tree support") from the s5p tree and
commit 400bf2995be6 ("Input: samsung-keypad - switch to using
SIMPLE_DEV_PM_OPS") from the input tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/input/keyboard/samsung-keypad.c
index 8a0060c,1a2b755..0000000
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@@ -21,10 -21,8 +21,10 @@@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
#include <linux/sched.h>
- #include <plat/keypad.h>
+ #include <linux/input/samsung-keypad.h>
#define SAMSUNG_KEYIFCON 0x00
#define SAMSUNG_KEYIFSTSCLR 0x04
@@@ -578,24 -440,11 +578,22 @@@ static int samsung_keypad_resume(struc
return 0;
}
-
- static const struct dev_pm_ops samsung_keypad_pm_ops = {
- .suspend = samsung_keypad_suspend,
- .resume = samsung_keypad_resume,
- };
#endif
+#ifdef CONFIG_OF
+static const struct of_device_id samsung_keypad_dt_match[] = {
+ { .compatible = "samsung,s3c6410-keypad" },
+ { .compatible = "samsung,s5pv210-keypad" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
+#else
+#define samsung_keypad_dt_match NULL
+#endif
+
+ static SIMPLE_DEV_PM_OPS(samsung_keypad_pm_ops,
+ samsung_keypad_suspend, samsung_keypad_resume);
+
static struct platform_device_id samsung_keypad_driver_ids[] = {
{
.name = "samsung-keypad",
@@@ -614,10 -463,7 +612,8 @@@ static struct platform_driver samsung_k
.driver = {
.name = "samsung-keypad",
.owner = THIS_MODULE,
+ .of_match_table = samsung_keypad_dt_match,
- #ifdef CONFIG_PM
.pm = &samsung_keypad_pm_ops,
- #endif
},
.id_table = samsung_keypad_driver_ids,
};
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the input tree with the s5p tree
From: Dmitry Torokhov @ 2011-11-11 3:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
In-Reply-To: <20111111131159.848e724c5a9257d0b9f0f0f9@canb.auug.org.au>
Hi Stephen,
On Thursday, November 10, 2011 06:11:59 PM Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
> samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p
> tree and commit 5862c02d745f ("Input: samsung-keypad - enable compiling
> on other platforms") from the input tree.
>
> I have fixed it up (probably incorrectly - see below) and can carry the
> fix as necessary.
Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
this driver needs. Expanding beyond Samsung will allow greater
compile coverage.
Thanks.
--
Dmitry
^ permalink raw reply
* Re: linux-next: manual merge of the input tree with the s5p tree
From: Dmitry Torokhov @ 2011-11-11 3:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
In-Reply-To: <20111111131147.3f7ab8c9f14a7d87cc83b5ac@canb.auug.org.au>
On Thursday, November 10, 2011 06:11:47 PM Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/keyboard/samsung-keypad.c between commit 532f74540134
> ("input: samsung-keypad: Add device tree support") from the s5p tree and
> commit 400bf2995be6 ("Input: samsung-keypad - switch to using
> SIMPLE_DEV_PM_OPS") from the input tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Yep, looks good, thanks Stephen.
--
Dmitry
^ permalink raw reply
* Re: linux-next: manual merge of the input tree with the s5p tree
From: Stephen Rothwell @ 2011-11-11 5:57 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
In-Reply-To: <201111101941.59570.dmitry.torokhov@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
Hi Dmitry,
On Thu, 10 Nov 2011 19:41:59 -0800 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> this driver needs. Expanding beyond Samsung will allow greater
> compile coverage.
OK, I have modified the conflict resolution for tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Nov 11
From: Stephen Rothwell @ 2011-11-11 6:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 26886 bytes --]
Hi all,
The patch is still absent from kernel.org.
Changes since 20111110:
The mips tree lost its build failure.
The slave-dma tree gained a conflict against the s5p tree.
The input tree gained conflicts against the s5p tree.
The pm tree still has its build failure so I used the version from
next-20111109.
----------------------------------------------------------------------------
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 195 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.
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 (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (1a1f2be ARM: 7155/1: arch.h: Declare 'pt_regs' locally)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (5ccf55d powerpc/kvm: Fix build failure with HV KVM and CBE)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
Merging scsi-rc-fixes/master (7457181 [SCSI] Silencing 'killing requests for dead queue')
Merging net/master (1e49570 net: Fix references to deleted NET_ETHERNET Kconfig setting.)
Merging sound-current/for-linus (d938e66 Merge branch 'fix/misc' into for-linus)
Merging pci-current/for-linus (fdbd3ce PCI: pciehp: Retrieve link speed after link is trained)
Merging wireless/master (0ecfe80 mac80211: fix race between connection monitor & suspend)
Merging driver-core.current/driver-core-linus (1ea6b8f Linux 3.2-rc1)
Merging tty.current/tty-linus (1ea6b8f Linux 3.2-rc1)
Merging usb.current/usb-linus (1ea6b8f Linux 3.2-rc1)
Merging staging.current/staging-linus (1ea6b8f Linux 3.2-rc1)
Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (3acc847 crypto: algapi - Fix build problem with NET disabled)
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 (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (51e9dd8 Merge branches 'fixes', 'misc' and 'restart-base' into for-next)
Merging arm-lpae/for-next (b382096 ARM: LPAE: Add the Kconfig entries)
Merging arm-soc/for-next (3155521 Revert "hvc_console: display printk messages on console.")
Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (98f5bc5 Merge branch 'next-samsung-devel' into for-next)
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (976d167 Linux 3.1-rc9)
Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
Merging m68k/for-next (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging m68knommu/for-next (8de5bbd m68k: make fp register stores consistent for m68k and ColdFire)
CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
Merging microblaze/next (3155521 Revert "hvc_console: display printk messages on console.")
Merging mips/mips-for-linux-next (1679505 Merge branch 'alchemy-for-3.3' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging s390/features (e570780 [S390] add support for physical memory > 4TB)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (5c8a0fb VFS: fix statfs() automounter semantics regression)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
Merging gfs2/master (79c4c37 GFS2: f_ra is always valid in dir readahead function)
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (62e4a76 NFS: Revert pnfs ugliness from the generic NFS read code path)
Merging nfsd/nfsd-next (c7e8472 NFSD: Remove unnecessary whitespace)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation)
Merging xfs/master (810627d xfs: fix force shutdown handling in xfs_end_io)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (44258a5 PCI: Fix PRI and PASID consistency)
Merging hid/for-next (30307c6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (f16e246 i2c-algo-bit: Generate correct i2c address sequence for 10-bit target)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (1ea6b8f Linux 3.2-rc1)
Merging hwmon-staging/hwmon-next (1ea6b8f Linux 3.2-rc1)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (eeff030 Merge branch 'poll-pwc' of /home/v4l/v4l/patchwork)
Merging kbuild/for-next (8398e54 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (c24f835 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (042f36e IB/qib: Don't use schedule_work())
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (c3b92c8 Linux 3.1)
Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (9b3fd24 dma: fix spacing for method declaration, coding style issue in iop-adma.c)
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (d826eb1 ipv4: PKTINFO doesnt need dst reference)
Merging wireless-next/master (1eb54c8 mwifiex: prevent corruption instead of just warning)
CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h
Merging bluetooth/master (4d611e4 Bluetooth: Only set ack_timer if we didn't send and ack)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (c0af4d0 mtd: nand: scan 1st and 2nd page for Macronix SLC)
Merging crypto/master (d19978f crypto: fix typo in crypto/Kconfig)
Merging sound/for-next (6036519 Merge branch 'fix/misc' into for-next)
Merging sound-asoc/for-next (515fedf Merge branch 'for-3.2' into for-3.3)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (bb6f197 virtio-balloon: Trivial cleanups)
Merging input/next (5862c02 Input: samsung-keypad - enable compiling on other platforms)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (30a4b71 Merge branch 'for-3.2/core' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
Merging mmc/mmc-next (47477c0 mmc: sd: Macro name cleanup for high speed dtr)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (0999774 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 (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (a92460d regulator: Don't create voltage sysfs entries if we can't read voltage)
Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (1ea6b8f Linux 3.2-rc1)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (830d7f5 Doc: 53c700: drop never defined (Kconfig) macros)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (284ea26 Merge branch 'pm-freezer' into linux-next)
$ git reset --hard HEAD^
Merging refs/next/20111109/pm
Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging kmemleak/kmemleak (cbc6e60 kmemleak: Handle percpu memory allocation)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (3155521 Revert "hvc_console: display printk messages on console.")
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (58072cb regmap: Fix memory leak in regmap_init error path)
Merging driver-core/driver-core-next (1ea6b8f Linux 3.2-rc1)
Merging tty/tty-next (1ea6b8f Linux 3.2-rc1)
Merging usb/usb-next (1ea6b8f Linux 3.2-rc1)
Merging staging/staging-next (1ea6b8f Linux 3.2-rc1)
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (1ea6b8f Linux 3.2-rc1)
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 (9d8972a pinctrl: documentation update)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging kvmtool/master (ef10d0b kvm tools: Add abstract virtio transport layer)
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: devtmpfsd: fix task state handling
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
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-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: block: avoid unnecessary plug list flush
Applying: block: add missed trace_block_plug
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Applying: bio: change some signed vars to unsigned
Applying: paride: fix potential information leak in pg_read()
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: add vm_area_add_early()
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: limit paths
Applying: oprofilefs: handle zero-length writes
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: proc: force dcache drop on unauthorized access
Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
Applying: kdump: Add udev events for memory online/offline
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: update parameters only after successful init
Merging akpm (083fbff ramoops: update parameters only after successful init)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] kernel/cpu.c: Add right qualifiers for intel_thermal_interrupt() and cpu_hotplug_pm_sync_init()
From: Srivatsa S. Bhat @ 2011-11-11 7:26 UTC (permalink / raw)
Cc: Linus Torvalds, Ingo Molnar, Rusty Russell, Rafael J. Wysocki,
linux-kernel, linux-pm, linux-next, Fenghua Yu
In-Reply-To: <1320956564-21334-1-git-send-email-fenghua.yu@intel.com>
On 11/11/2011 01:52 AM, Fenghua Yu wrote:
> From: Fenghua Yu <fenghua.yu@intel.com>
>
> Add __init for functions alloc_frozen_cpus() and cpu_hotplug_pm_sync_init()
> because they are only called during boot time.
>
> Add static for function cpu_hotplug_pm_sync_init() because its scope is limited
> in this file only.
>
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
> ---
> kernel/cpu.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/cpu.c b/kernel/cpu.c
> index 563f136..cf915b8 100644
> --- a/kernel/cpu.c
> +++ b/kernel/cpu.c
> @@ -470,7 +470,7 @@ out:
> cpu_maps_update_done();
> }
>
> -static int alloc_frozen_cpus(void)
> +static int __init alloc_frozen_cpus(void)
> {
> if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO))
> return -ENOMEM;
> @@ -543,7 +543,7 @@ cpu_hotplug_pm_callback(struct notifier_block *nb,
> }
>
>
> -int cpu_hotplug_pm_sync_init(void)
> +static int __init cpu_hotplug_pm_sync_init(void)
> {
> pm_notifier(cpu_hotplug_pm_callback, 0);
pm_notifier() macro will declare a static variable. I agree this won't
be any problem functionality-wise. But it doesn't seem elegant to say
"throw away the function but keep the static variable".
So, if you want to add __init qualifier to this function, I suggest that
you declare the static variable outside the function, and call
register_pm_notifier() in the function, just to ensure it doesn't obscure
things.
And please change the title, it talks about intel_thermal_interrupt()!
Thanks,
Srivatsa S. Bhat
> return 0;
^ permalink raw reply
* Re: linux-next: manual merge of the slave-dma tree with the s5p tree
From: Thomas Abraham @ 2011-11-11 8:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vinod Koul, linux-next, linux-kernel, Boojin Kim, Kukjin Kim, joe
In-Reply-To: <20111111120013.e425db4686acbd346e10a49b@canb.auug.org.au>
Hi Stephen,
On 11 November 2011 06:30, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commit c6e00b47067b ("DMA: PL330: Add device
> tree support") from the s5p tree and commit dab6538e29e6 ("DMA: PL330:
> Fix build warning") from the slave-dma tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/dma/pl330.c
> index a626e15,186b822..0000000
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@@ -870,8 -856,8 +870,8 @@@ pl330_probe(struct amba_device *adev, c
> INIT_LIST_HEAD(&pd->channels);
>
> /* Initialize channel parameters */
> - num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
> - (u8)pi->pcfg.num_chan);
> - num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
> - (int)pi->pcfg.num_chan);
> ++ num_chan = max(pdat ? (int)pdat->nr_valid_peri : (int)pi->pcfg.num_peri,
> ++ (int)pi->pcfg.num_chan);
> pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
>
> for (i = 0; i < num_chan; i++) {
>
Thanks for the fix.
Also taking into account the suggestion from Joe Perches, this change could be
> - num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
> - (u8)pi->pcfg.num_chan);
> - num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
> - (int)pi->pcfg.num_chan);
> ++ num_chan = max_t(int, pdat ? pdat->nr_valid_peri : pi->pcfg.num_peri,
> ++ pi->pcfg.num_chan);
> pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
>
Regards,
Thomas.
^ permalink raw reply
* Re: linux-next: manual merge of the input tree with the s5p tree
From: Thomas Abraham @ 2011-11-11 8:40 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Stephen Rothwell, linux-next, linux-kernel, Kukjin Kim
In-Reply-To: <201111101941.59570.dmitry.torokhov@gmail.com>
Hi Dmitry,
On 11 November 2011 09:11, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> Hi Stephen,
>
> On Thursday, November 10, 2011 06:11:59 PM Stephen Rothwell wrote:
>> Hi Dmitry,
>>
>> Today's linux-next merge of the input tree got a conflict in
>> drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input:
>> samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p
>> tree and commit 5862c02d745f ("Input: samsung-keypad - enable compiling
>> on other platforms") from the input tree.
>>
>> I have fixed it up (probably incorrectly - see below) and can carry the
>> fix as necessary.
>
> Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all
> this driver needs. Expanding beyond Samsung will allow greater
> compile coverage.
Thanks for the suggestion. I will modify device tree support for
samsung keypad driver that is merged in s5p tree for-next branch.
Regards,
Thomas.
>
> Thanks.
>
> --
> Dmitry
>
^ permalink raw reply
* Blackfin.git tree change
From: Bob Liu @ 2011-11-11 10:49 UTC (permalink / raw)
To: sfr, Linux-Kernel, linux-next; +Cc: Mike Frysinger, sonic.zhang
Hi, Stephen
I'll take most of the arch Blackfin maintain work from now on.
My tree is:
git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus
Would you please update it for linux-next.
Thanks.
--
Regards,
--Bob
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2011-11-11 12:27 UTC (permalink / raw)
To: Stephen Rothwell, Tejun Heo; +Cc: linux-next, linux-kernel
In-Reply-To: <20111110133106.12e519d17f6a28adfee3b883@canb.auug.org.au>
On Thursday, November 10, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> mm/oom_kill.c: In function 'select_bad_process':
> mm/oom_kill.c:326:5: error: implicit declaration of function 'thaw_process'
>
> Caused by commit 944e192db53c ("freezer: rename thaw_process() to
> __thaw_task() and simplify the implementation").
>
> I have used the pm tree from next-20111109 for today.
The appended patch fixes the build problem for me. I've added it to my
linux-next branch already.
Tejun, please let me know if that's OK.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: PM / Freezer: Fix fallout of thaw_process() -> __thaw_task() rename
The changset that renamed thaw_process() to __thaw_task() forgot to
modify oom_kill.c in accordance with that change and introduced
a build problem. Fix it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
mm/oom_kill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux/mm/oom_kill.c
===================================================================
--- linux.orig/mm/oom_kill.c
+++ linux/mm/oom_kill.c
@@ -323,7 +323,7 @@ static struct task_struct *select_bad_pr
*/
if (test_tsk_thread_flag(p, TIF_MEMDIE)) {
if (unlikely(frozen(p)))
- thaw_process(p);
+ __thaw_task(p);
return ERR_PTR(-1UL);
}
if (!p->mm)
^ permalink raw reply
* Re: Blackfin.git tree change
From: Stephen Rothwell @ 2011-11-13 12:19 UTC (permalink / raw)
To: Bob Liu; +Cc: Linux-Kernel, linux-next, Mike Frysinger, sonic.zhang
In-Reply-To: <CAA_GA1f8+6bqXGXo33GDbJmXvaqdD-qMUh=ejx0+Ag-shmc0uw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2510 bytes --]
Hi Bob,
On Fri, 11 Nov 2011 18:49:59 +0800 Bob Liu <lliubbo@gmail.com> wrote:
>
> I'll take most of the arch Blackfin maintain work from now on.
>
> My tree is:
> git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus
>
> Would you please update it for linux-next.
OK, I have switched to that tree and will put you as the contact. Should
I also keep Mike as a contact for problems with this tree?
The only thing I did notice, is that this commit was in Mike's tree but
is not in yours:
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon Aug 1 17:53:21 2011 +0800
Blackfin: add serial TX IRQ in individual platform resource
The serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips,
so move the values to the platform resources.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Just in case it was forgotten.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: missing trees
From: Stephen Rothwell @ 2011-11-13 13:37 UTC (permalink / raw)
To: LKML; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 1838 bytes --]
Hi all,
The trees below are still missing from linux-next. The URL column is
relative to git://git.kernel.org/pub/scm/linux/kernel/git/ .
Tree URL branch
---- --- ------
audit-current viro/audit-current.git for-linus
sh-current lethal/sh-2.6.git sh-fixes-for-linus
rmobile-current lethal/sh-2.6.git rmobile-fixes-for-linus
linux-spec dwalker/linux-spec for-next
omap tmlind/linux-omap-2.6.git for-next
pxa ycmiao/pxa-linux-2.6.git for-next
4xx jwboyer/powerpc-4xx.git next
sh lethal/sh-2.6.git sh-latest
rmobile lethal/sh-2.6.git rmobile-latest
unicore32 epip/linux-unicore.git unicore32
xtensa czankel/xtensa-next.git master
configfs jlbec/configfs.git linux-next
ecryptfs ecryptfs/ecryptfs-2.6.git next
fatfs hirofumi/fatfs-2.6.git master
fuse mszeredi/fuse.git for-next
hfsplus hch/hfsplus.git for-next
jfs shaggy/jfs-2.6.git next
nilfs2 ryusuke/nilfs2.git for-next
vfs viro/vfs-2.6.git for-next
vfs-scale npiggin/linux-npiggin.git vfs-scale-working
kconfig rostedt/linux-2.6-kconfig.git for-next
cpupowerutils brodo/cpupowerutils.git master
swiotlb konrad/swiotlb-2.6.git master
ibft konrad/ibft-2.6.git master
async_tx djbw/async_tx.git next
cpufreq davej/cpufreq.git next
input-mt rydberg/input-mt.git next
lsm chrisw/lsm-2.6.git for-next
pcmcia brodo/pcmcia-2.6.git master
hdlc chris/linux-2.6.git hdlc-next
bdev viro/bdev.git master
nommu dhowells/linux-2.6-nommu.git master
sfi lenb/linux-sfi-2.6.git sfi-test
asm-generic arnd/asm-generic next
drivers-x86 mjg59/platform-drivers-x86 linux-next
hwpoison ak/linux-mce-2.6.git hwpoison
namespace ebiederm/linux-2.6-nsfd.git master
bkl-config arnd/bkl.git config
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: cleanup time
From: Stephen Rothwell @ 2011-11-13 13:52 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi all,
Since we are out of the merge window, could people with trees in
linux-next please take th opportunity to clean them up. Hopefully,
Linus took all the contents of your trees, in which case git
trees/branches should be reset to be a (subset of) Linus' tree (this will
be a noop for those for whom Linus pulled that actual branch that is in
linux-next). For quilt series, you should remove any patches that Linus
has merged.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Blackfin.git tree change
From: Bob Liu @ 2011-11-13 14:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Kernel, linux-next, Mike Frysinger, sonic.zhang
In-Reply-To: <20111113231944.4677bd7a2154975c989663ab@canb.auug.org.au>
Hi, Stephen
On Sun, Nov 13, 2011 at 8:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bob,
>
> On Fri, 11 Nov 2011 18:49:59 +0800 Bob Liu <lliubbo@gmail.com> wrote:
>>
>> I'll take most of the arch Blackfin maintain work from now on.
>>
>> My tree is:
>> git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus
>>
>> Would you please update it for linux-next.
>
> OK, I have switched to that tree and will put you as the contact. Should
> I also keep Mike as a contact for problems with this tree?
>
Yes, Please.
> The only thing I did notice, is that this commit was in Mike's tree but
> is not in yours:
>
> Author: Sonic Zhang <sonic.zhang@analog.com>
> Date: Mon Aug 1 17:53:21 2011 +0800
>
> Blackfin: add serial TX IRQ in individual platform resource
>
> The serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips,
> so move the values to the platform resources.
>
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>
> Just in case it was forgotten.
>
Sorry for that, I thought that patch has been merged to mainline.
I'll update it soon. Thanks.
> Thanks for adding your subsystem tree as a participant of linux-next. As
> you may know, this is not a judgment of your code. The purpose of
> linux-next is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
>
> You will need to ensure that the patches/commits in your tree/series have
> been:
> * submitted under GPL v2 (or later) and include the Contributor's
> Signed-off-by,
> * posted to the relevant mailing list,
> * reviewed by you (or another maintainer of your subsystem tree),
> * successfully unit tested, and
> * destined for the current or next Linux merge window.
>
> Basically, this should be just what you would send to Linus (or ask him
> to fetch). It is allowed to be rebased if you deem it necessary.
>
> --
> Cheers,
> Stephen Rothwell
> sfr@canb.auug.org.au
>
> Legal Stuff:
> By participating in linux-next, your subsystem tree contributions are
> public and will be included in the linux-next trees. You may be sent
> e-mail messages indicating errors or other issues when the
> patches/commits from your subsystem tree are merged and tested in
> linux-next. These messages may also be cross-posted to the linux-next
> mailing list, the linux-kernel mailing list, etc. The linux-next tree
> project and IBM (my employer) make no warranties regarding the linux-next
> project, the testing procedures, the results, the e-mails, etc. If you
> don't agree to these ground rules, let me know and I'll remove your tree
> from participation in linux-next.
>
--
Regards,
--Bob
^ permalink raw reply
* Re: Blackfin.git tree change
From: Mike Frysinger @ 2011-11-13 16:50 UTC (permalink / raw)
To: Bob Liu; +Cc: Stephen Rothwell, Linux-Kernel, linux-next, sonic.zhang
In-Reply-To: <CAA_GA1fFspdayjpLNpm1C-kPug6n7LXyJ0dqiX=3d_gHt2U9xg@mail.gmail.com>
[-- Attachment #1: Type: Text/Plain, Size: 1082 bytes --]
On Sunday 13 November 2011 09:50:41 Bob Liu wrote:
> On Sun, Nov 13, 2011 at 8:19 PM, Stephen Rothwell wrote:
> > The only thing I did notice, is that this commit was in Mike's tree but
> > is not in yours:
> >
> > Author: Sonic Zhang <sonic.zhang@analog.com>
> > Date: Mon Aug 1 17:53:21 2011 +0800
> >
> > Blackfin: add serial TX IRQ in individual platform resource
> >
> > The serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips,
> > so move the values to the platform resources.
> >
> > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> >
> > Just in case it was forgotten.
>
> Sorry for that, I thought that patch has been merged to mainline.
> I'll update it soon. Thanks.
i figured this would be a good test for you merging things ;). this patch
needs to be merged into mainline before 3.2 is released ... and the sooner,
the better.
it was waiting on the tty/serial layers to be merged, and now that they have,
that patch can now be merged.
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH -next] qnx4fs: Use kmemdup rather than duplicating its implementation
From: Anders Larsen @ 2011-11-13 17:47 UTC (permalink / raw)
To: linux-next, linux-kernel; +Cc: Thomas Meyer
From: Thomas Meyer <thomas@m3y3r.de>
Use kmemdup rather than duplicating its implementation
The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Anders Larsen <al@alarsen.net>
---
diff -u -p a/fs/qnx4/inode.c b/fs/qnx4/inode.c
--- a/fs/qnx4/inode.c 2011-11-07 19:38:23.987165894 +0100
+++ b/fs/qnx4/inode.c 2011-11-08 10:33:59.882543999 +0100
@@ -199,12 +199,13 @@ static const char *qnx4_checkroot(struct
if (!strcmp(rootdir->di_fname,
QNX4_BMNAME)) {
found = 1;
- qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
+ qnx4_sb(sb)->BitMap = kmemdup(rootdir,
+ sizeof(struct qnx4_inode_entry),
+ GFP_KERNEL);
if (!qnx4_sb(sb)->BitMap) {
brelse (bh);
return "not enough memory for bitmap inode";
- }
- memcpy( qnx4_sb(sb)->BitMap, rootdir, sizeof( struct qnx4_inode_entry ) ); /* keep bitmap inode known */
+ }/* keep bitmap inode known */
break;
}
}
^ permalink raw reply
* Re: Blackfin.git tree change
From: Stephen Rothwell @ 2011-11-13 23:15 UTC (permalink / raw)
To: Bob Liu; +Cc: Linux-Kernel, linux-next, Mike Frysinger, sonic.zhang
In-Reply-To: <CAA_GA1fFspdayjpLNpm1C-kPug6n7LXyJ0dqiX=3d_gHt2U9xg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
Hi Bob,
On Sun, 13 Nov 2011 22:50:41 +0800 Bob Liu <lliubbo@gmail.com> wrote:
>
> On Sun, Nov 13, 2011 at 8:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Bob,
> >
> > On Fri, 11 Nov 2011 18:49:59 +0800 Bob Liu <lliubbo@gmail.com> wrote:
> >>
> > OK, I have switched to that tree and will put you as the contact. Should
> > I also keep Mike as a contact for problems with this tree?
>
> Yes, Please.
Done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the m68knommu tree with the m68k tree
From: Stephen Rothwell @ 2011-11-14 0:03 UTC (permalink / raw)
To: Greg Ungerer; +Cc: linux-next, linux-kernel, Kars de Jong, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/Kconfig.debug between commit 049755db2c3f ("m68k/mvme16x: Add
support for EARLY_PRINTK") from the m68k tree and commit d0106cf0aa29
("m68k: support configure time command line for MMU m68k") from the
m68knommu tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/m68k/Kconfig.debug
index a0c8863,af4fd5f..0000000
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,17 -2,14 +2,25 @@@ menu "Kernel hacking
source "lib/Kconfig.debug"
+config EARLY_PRINTK
+ bool "Early printk" if EMBEDDED
+ depends on MVME16x || MAC
+ default y
+ help
+ Write kernel log output directly to a serial port.
+
+ This is useful for kernel debugging when your machine crashes very
+ early before the console code is initialized.
+ You should normally say N here, unless you want to debug such a crash.
+
+ config BOOTPARAM
+ bool 'Compiled-in Kernel Boot Parameter'
+
+ config BOOTPARAM_STRING
+ string 'Kernel Boot Parameter'
+ default 'console=ttyS0,19200'
+ depends on BOOTPARAM
+
if !MMU
config FULLDEBUG
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the m68knommu tree with the m68k tree
From: Greg Ungerer @ 2011-11-14 0:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Kars de Jong, Geert Uytterhoeven
In-Reply-To: <20111114110305.5b04e0b5509cd0489c7d9440@canb.auug.org.au>
Hi Stephen,
On 14/11/11 10:03, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/Kconfig.debug between commit 049755db2c3f ("m68k/mvme16x: Add
> support for EARLY_PRINTK") from the m68k tree and commit d0106cf0aa29
> ("m68k: support configure time command line for MMU m68k") from the
> m68knommu tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks for the heads up. Geert's irq changes have been pushed in now,
so I will rebase my patches and fix up the few bits of breakage you
have seen.
Thanks
Greg
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the wireless tree
From: Stephen Rothwell @ 2011-11-14 0:53 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Steven Miao
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/libertas/cfg.c between commit d929bbc63069
("wireless: libertas: fix unaligned le64 accesses") from the wireless
tree and commit 731f8e1c41a4 ("libertas: release bss references and avoid
warning from cfg80211_inform_bss") from the wireless-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/libertas/cfg.c
index a7f1ab2,89f34ad..0000000
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -632,9 -633,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
LBS_SCAN_RSSI_TO_MBM(rssi)/100);
if (channel &&
- !(channel->flags & IEEE80211_CHAN_DISABLED))
- cfg80211_inform_bss(wiphy, channel,
+ !(channel->flags & IEEE80211_CHAN_DISABLED)) {
+ bss = cfg80211_inform_bss(wiphy, channel,
- bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+ bssid, get_unaligned_le64(tsfdesc),
capa, intvl, ie, ielen,
LBS_SCAN_RSSI_TO_MBM(rssi),
GFP_KERNEL);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the pm tree (and warning)
From: Stephen Rothwell @ 2011-11-14 2:17 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Guennadi Liakhovetski, Vinod Koul,
Tejun Heo, Nicolas Ferre, Dan Williams
[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]
Hi Rafael,
After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/dma/dmatest.c: In function 'dmatest_func':
drivers/dma/dmatest.c:255:2: error: implicit declaration of function 'set_freezable_with_signal' [-Werror=implicit-function-declaration]
Caused by commit cd3bc8fbc2d5 ("freezer: kill unused
set_freezable_with_signal()") interacting with commit 981ed70d8e4f
("dmatest: make dmatest threads freezable") from Linus' tree (merged into
v3.2-rc1).
I reverted the pm tree commit for today.
I also noticed this warning:
drivers/dma/dmatest.c: In function 'dmatest_add_channel':
drivers/dma/dmatest.c:594:28: warning: the omitted middle operand in ?: will always be 'true', suggest explicit middle operand [-Wparentheses]
Which has been there since 2009 ... I think points out an error in the
code (looking at the lines above there). The two occurrences above were
fixed in commit f1aef8b6e6ab ("dmaengine: dmatest: correct thread_count
while using multiple thread per channel") but the third came in via a
different branch (commit 58691d64c44a "dmatest: add pq support") and was
not corrected.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (pm tree related)
From: Stephen Rothwell @ 2011-11-14 3:24 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Tejun Heo
[-- Attachment #1: Type: text/plain, Size: 1865 bytes --]
Hi Rafael,
After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:
mm/oom_kill.c: In function 'select_bad_process':
mm/oom_kill.c:326:5: error: implicit declaration of function '__thaw_task' [-Werror=implicit-function-declaration]
Caused by commit 23527e313ca5 ("PM / Freezer: Fix fallout of thaw_process()
-> __thaw_task() rename"). __thaw_task() is only declared id
CONFIG_FREEZER is set. Commit 944e192db53c ("freezer: rename thaw_process()
to __thaw_task() and simplify the implementation") removed the second
declaration of thaw_process() without replacing it ...
I have added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Nov 2011 14:19:32 +1100
Subject: [PATCH] freezer: fix more fallout from the thaw_process rename
Commit 944e192db53c "freezer: rename thaw_process() to __thaw_task()
and simplify the implementation" did not create a !CONFIG_FREEZER version
of __thaw_task().
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/freezer.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index cc779bb..a9dccc6 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -166,6 +166,7 @@ static inline bool set_freezable_with_signal(void)
#else /* !CONFIG_FREEZER */
static inline bool frozen(struct task_struct *p) { return false; }
static inline bool freezing(struct task_struct *p) { return false; }
+static inline void __thaw_task(struct task_struct *t) {}
static inline bool __refrigerator(bool check_kthr_stop) { return false; }
static inline int freeze_processes(void) { return -ENOSYS; }
--
1.7.7.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: Tree for Nov 14
From: Stephen Rothwell @ 2011-11-14 3:43 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 27395 bytes --]
Hi all,
The patch is still absent from kernel.org.
Changes since 20111111:
The m68knommu gained a conflict against the m68k tree.
The wireless-next tree gained a conflict against the wireless tree.
The pm tree lost its build failure but gained two others for which I
reverted a commit and applied a patch.
I removed 3 patches from the akpm tree that have shown 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/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 195 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.
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 (52e4c2a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (a34dbfb ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (5ccf55d powerpc/kvm: Fix build failure with HV KVM and CBE)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
Merging scsi-rc-fixes/master (cf16123 [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy)
Merging net/master (4b90a60 ah: Don't return NET_XMIT_DROP on input.)
Merging sound-current/for-linus (d938e66 Merge branch 'fix/misc' into for-linus)
Merging pci-current/for-linus (b3c0045 PCI: pciehp: wait 100 ms after Link Training check)
Merging wireless/master (fada105 mwifiex: fix association issue with AP configured in hidden SSID mode)
Merging driver-core.current/driver-core-linus (1ea6b8f Linux 3.2-rc1)
Merging tty.current/tty-linus (1ea6b8f Linux 3.2-rc1)
Merging usb.current/usb-linus (1ea6b8f Linux 3.2-rc1)
Merging staging.current/staging-linus (1ea6b8f Linux 3.2-rc1)
Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (3acc847 crypto: algapi - Fix build problem with NET disabled)
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 (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (c18ebb1 Merge branches 'fixes', 'misc', 'pgt' and 'restart-base' into for-next)
Merging arm-lpae/for-next (b382096 ARM: LPAE: Add the Kconfig entries)
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
Merging arm-soc/for-next (3155521 Revert "hvc_console: display printk messages on console.")
Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (98f5bc5 Merge branch 'next-samsung-devel' into for-next)
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (976d167 Linux 3.1-rc9)
Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
Merging m68k/for-next (2f0084b m68k/atari: Move declaration of atari_SCC_reset_done to header file)
Merging m68knommu/for-next (8de5bbd m68k: make fp register stores consistent for m68k and ColdFire)
CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
Merging microblaze/next (3155521 Revert "hvc_console: display printk messages on console.")
Merging mips/mips-for-linux-next (b4f13a2 Merge branch 'bmips' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging s390/features (1082855 [S390] kernel: Fix smp_switch_to_ipl_cpu() stack frame setup)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (5c8a0fb VFS: fix statfs() automounter semantics regression)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
Merging gfs2/master (79c4c37 GFS2: f_ra is always valid in dir readahead function)
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (62e4a76 NFS: Revert pnfs ugliness from the generic NFS read code path)
Merging nfsd/nfsd-next (c7e8472 NFSD: Remove unnecessary whitespace)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation)
Merging xfs/master (810627d xfs: fix force shutdown handling in xfs_end_io)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
Merging hid/for-next (20d5759 Merge branch 'wacom' into for-next)
Merging quilt/i2c (f16e246 i2c-algo-bit: Generate correct i2c address sequence for 10-bit target)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (1ea6b8f Linux 3.2-rc1)
Merging hwmon-staging/hwmon-next (1ea6b8f Linux 3.2-rc1)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (eeff030 Merge branch 'poll-pwc' of /home/v4l/v4l/patchwork)
Merging kbuild/for-next (8398e54 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (c24f835 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (042f36e IB/qib: Don't use schedule_work())
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (c3b92c8 Linux 3.1)
Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (9b3fd24 dma: fix spacing for method declaration, coding style issue in iop-adma.c)
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (3d249d4 net: introduce ethernet teaming device)
Merging wireless-next/master (b4487c2 mac80211: fix warning in ieee80211_probe_client)
CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cfg.c
Merging bluetooth/master (4d611e4 Bluetooth: Only set ack_timer if we didn't send and ack)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (c0af4d0 mtd: nand: scan 1st and 2nd page for Macronix SLC)
Merging crypto/master (d19978f crypto: fix typo in crypto/Kconfig)
Merging sound/for-next (769f11e Merge branch 'fix/hda' into for-next)
Merging sound-asoc/for-next (a9317e8 ASoC: ak4642: add ak4648 support)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (bb6f197 virtio-balloon: Trivial cleanups)
Merging input/next (c22e9b3 Input: add EETI eGalax I2C capacitive multi touch driver)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (a629e9a Merge branch 'for-3.3/mtip32xx' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
Merging mmc/mmc-next (6c0cf5c mmc: core: Fix setting power notify state variable for non-eMMC)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (0999774 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 (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
Merging fbdev/fbdev-next (4420dd2 video: s3c-fb: fix transparency length for pixel blending)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (a92460d regulator: Don't create voltage sysfs entries if we can't read voltage)
Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (1ea6b8f Linux 3.2-rc1)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (92094aa MAINTAINERS: update ipwireless entry)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (23527e3 PM / Freezer: Fix fallout of thaw_process() -> __thaw_task() rename)
[master abca3a7] Revert "freezer: kill unused set_freezable_with_signal()"
Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging kmemleak/kmemleak (cbc6e60 kmemleak: Handle percpu memory allocation)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (3155521 Revert "hvc_console: display printk messages on console.")
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (58072cb regmap: Fix memory leak in regmap_init error path)
Merging driver-core/driver-core-next (1ea6b8f Linux 3.2-rc1)
Merging tty/tty-next (1ea6b8f Linux 3.2-rc1)
Merging usb/usb-next (1ea6b8f Linux 3.2-rc1)
Merging staging/staging-next (1ea6b8f Linux 3.2-rc1)
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (1ea6b8f Linux 3.2-rc1)
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 (412a6bf pinctrl: add a pin_base for sparse gpio-ranges)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging kvmtool/master (ef10d0b kvm tools: Add abstract virtio transport layer)
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: devtmpfsd: fix task state handling
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
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-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: block: avoid unnecessary plug list flush
Applying: block: add missed trace_block_plug
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Applying: bio: change some signed vars to unsigned
Applying: paride: fix potential information leak in pg_read()
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: add vm_area_add_early()
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: limit paths
Applying: oprofilefs: handle zero-length writes
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: proc: force dcache drop on unauthorized access
Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
Applying: kdump: Add udev events for memory online/offline
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: update parameters only after successful init
Merging akpm (b01633e ramoops: update parameters only after successful init)
Applying: freezer: fix more fallout from the thaw_process rename
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (pm tree related)
From: Rafael J. Wysocki @ 2011-11-14 23:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tejun Heo
In-Reply-To: <20111114142423.fe126b8c8cfd275d7dd138cc@canb.auug.org.au>
On Monday, November 14, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> mm/oom_kill.c: In function 'select_bad_process':
> mm/oom_kill.c:326:5: error: implicit declaration of function '__thaw_task' [-Werror=implicit-function-declaration]
>
> Caused by commit 23527e313ca5 ("PM / Freezer: Fix fallout of thaw_process()
> -> __thaw_task() rename"). __thaw_task() is only declared id
> CONFIG_FREEZER is set. Commit 944e192db53c ("freezer: rename thaw_process()
> to __thaw_task() and simplify the implementation") removed the second
> declaration of thaw_process() without replacing it ...
>
> I have added this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 14 Nov 2011 14:19:32 +1100
> Subject: [PATCH] freezer: fix more fallout from the thaw_process rename
>
> Commit 944e192db53c "freezer: rename thaw_process() to __thaw_task()
> and simplify the implementation" did not create a !CONFIG_FREEZER version
> of __thaw_task().
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
I've applied your patch to linux-pm/pm-freezer and merged it into
linux-pm/linux-next.
Thanks,
Rafael
> ---
> include/linux/freezer.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/freezer.h b/include/linux/freezer.h
> index cc779bb..a9dccc6 100644
> --- a/include/linux/freezer.h
> +++ b/include/linux/freezer.h
> @@ -166,6 +166,7 @@ static inline bool set_freezable_with_signal(void)
> #else /* !CONFIG_FREEZER */
> static inline bool frozen(struct task_struct *p) { return false; }
> static inline bool freezing(struct task_struct *p) { return false; }
> +static inline void __thaw_task(struct task_struct *t) {}
>
> static inline bool __refrigerator(bool check_kthr_stop) { return false; }
> static inline int freeze_processes(void) { return -ENOSYS; }
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree (and warning)
From: Rafael J. Wysocki @ 2011-11-14 23:14 UTC (permalink / raw)
To: Stephen Rothwell, Tejun Heo
Cc: linux-next, linux-kernel, Guennadi Liakhovetski, Vinod Koul,
Nicolas Ferre, Dan Williams
In-Reply-To: <20111114131730.ae09bb18b87e67f61a97275e@canb.auug.org.au>
On Monday, November 14, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/dma/dmatest.c: In function 'dmatest_func':
> drivers/dma/dmatest.c:255:2: error: implicit declaration of function 'set_freezable_with_signal' [-Werror=implicit-function-declaration]
>
> Caused by commit cd3bc8fbc2d5 ("freezer: kill unused
> set_freezable_with_signal()") interacting with commit 981ed70d8e4f
> ("dmatest: make dmatest threads freezable") from Linus' tree (merged into
> v3.2-rc1).
>
> I reverted the pm tree commit for today.
Thanks, I've added the following patch to linux-pm/linux-next, which should
fix this problem (Tejun, if that's not the right thing to do, please let me
know).
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: Freezer: Make dmatest_func() use set_freezable()
According to the commit cd3bc8fbc2d55ae0918184fb34992054dc4eb710
(freezer: kill unused set_freezable_with_signal()) changelog,
it should be sufficient to use set_freezable() instead of
set_freezable_with_signal(), which has been removed, in
dmatest_func(), so do that and fix a build issue.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/dma/dmatest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux/drivers/dma/dmatest.c
===================================================================
--- linux.orig/drivers/dma/dmatest.c
+++ linux/drivers/dma/dmatest.c
@@ -252,7 +252,7 @@ static int dmatest_func(void *data)
int i;
thread_name = current->comm;
- set_freezable_with_signal();
+ set_freezable();
ret = -ENOMEM;
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox