* Re: [PATCH] powerpc/of: add OF_DYNAMIC for chroma
From: Michael Neuling @ 2012-02-20 23:16 UTC (permalink / raw)
To: Jimi Xenidis; +Cc: grant.likely, linux-next, linuxppc-dev, benh
In-Reply-To: <5A594805-C5CE-46E7-A15F-DF86E6FE6C42@pobox.com>
Grant,
This seems to be broken in your tree (since 301b605ff6), so you should
probably pick up this patch.
Mikey
In message <5A594805-C5CE-46E7-A15F-DF86E6FE6C42@pobox.com> you wrote:
>
> On Feb 19, 2012, at 4:48 PM, Michael Neuling wrote:
>
> > linux next-20120217 compiling ppc64e_defconfig fails with:
> >=20
> > arch/powerpc/platforms/wsp/h8.c: In function 'wsp_h8_getaddr':
> > arch/powerpc/platforms/wsp/h8.c:116: error: implicit declaration of =
> function 'of_detach_node'
> >=20
> > The below fixes this by selecting the new OF_DYNAMIC when PPC_CHROMA.
> >=20
> > Signed-off-by: Michael Neuling <mikey@neuling.org>
>
> Acked-by: Jimi Xenidis <jimix@pobox.com>
>
> >=20
> > diff --git a/arch/powerpc/platforms/wsp/Kconfig =
> b/arch/powerpc/platforms/wsp/Kconfig
> > index 57d22a2..79d2225 100644
> > --- a/arch/powerpc/platforms/wsp/Kconfig
> > +++ b/arch/powerpc/platforms/wsp/Kconfig
> > @@ -25,6 +25,7 @@ config PPC_CHROMA
> > bool "PowerEN PCIe Chroma Card"
> > select EPAPR_BOOT
> > select PPC_WSP
> > + select OF_DYNAMIC
> > default y
> >=20
> > endmenu
>
^ permalink raw reply
* Re: [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected
From: Ondrej Zary @ 2012-02-20 20:49 UTC (permalink / raw)
To: Florian Tobias Schandinat
Cc: linux-fbdev, linux-kernel, Stephen Rothwell, linux-next
In-Reply-To: <1329687211-6545-1-git-send-email-FlorianSchandinat@gmx.de>
On Sunday 19 February 2012 22:33:31 Florian Tobias Schandinat wrote:
> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> ---
> drivers/video/i740fb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
> index 8be0302..fe574d8 100644
> --- a/drivers/video/i740fb.c
> +++ b/drivers/video/i740fb.c
> @@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev
> *dev) struct fb_info *info = pci_get_drvdata(dev);
>
> if (info) {
> -#ifdef CONFIG_MTRR
> struct i740fb_par *par = info->par;
>
> +#ifdef CONFIG_MTRR
> if (par->mtrr_reg >= 0) {
> mtrr_del(par->mtrr_reg, 0, 0);
> par->mtrr_reg = -1;
Thanks for fixing my stupid bug. I thought that I tested it without
CONFIG_MTRR. But obviously didn't.
--
Ondrej Zary
^ permalink raw reply
* Re: [PATCH -next] ext4: get rid of compile warning
From: Randy Dunlap @ 2012-02-20 16:00 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Theodore Ts'o, linux-next
In-Reply-To: <20120220125655.GA2651@osiris.boeblingen.de.ibm.com>
On 02/20/2012 04:56 AM, Heiko Carstens wrote:
> Get rid of this one:
>
> fs/ext4/balloc.c: In function 'ext4_wait_block_bitmap':
> fs/ext4/balloc.c:405:3: warning: format '%llu' expects argument of
> type 'long long unsigned int', but argument 6 has type 'sector_t' [-Wformat]
>
> Happens because sector_t is u64 (unsigned long long) or unsigned long
> dependent on CONFIG_64BIT.
>
> Signed-off-by: Heiko Carstens<heiko.carstens@de.ibm.com>
I sent the same patch on Jan. 30. I wonder what happened to it?
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> fs/ext4/balloc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
> index 95c87ab..c355890 100644
> --- a/fs/ext4/balloc.c
> +++ b/fs/ext4/balloc.c
> @@ -404,7 +404,7 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group,
> if (!buffer_uptodate(bh)) {
> ext4_error(sb, "Cannot read block bitmap - "
> "block_group = %u, block_bitmap = %llu",
> - block_group, bh->b_blocknr);
> + block_group, (unsigned long long) bh->b_blocknr);
> return 1;
> }
> /* Panic or remount fs read-only if block bitmap is invalid */
--
~Randy
^ permalink raw reply
* Re: [PATCH] mm: add config NUMA stub to all architectures
From: Michal Marek @ 2012-02-20 14:24 UTC (permalink / raw)
To: Arnaud Lacombe
Cc: Randy Dunlap, Geert Uytterhoeven, Andrew Morton,
Konstantin Khlebnikov, Stephen Rothwell, linux-next, LKML,
Sam Ravnborg, linux-kbuild
In-Reply-To: <CACqU3MUOojw0pwzOpPFB9YvA=BLODe+idWkqwA7NUAm-9114Rw@mail.gmail.com>
On 20.2.2012 00:21, Arnaud Lacombe wrote:
> On Sun, Feb 19, 2012 at 1:12 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> On 02/19/2012 09:01 AM, Geert Uytterhoeven wrote:
>>>
>>> On Fri, Feb 17, 2012 at 21:30, Andrew Morton<akpm@linux-foundation.org>
>>> wrote:
>>>> It would be better to teach IS_ENABLED() to handle this situation. I
>>>> don't think there's a way of doing this with cpp :(
>>>>
>>>> This limitation makes IS_ENABLED pretty dangerous, doesn't it? It
>>>> makes it very easy to introduce build breakage with unexpected Kconfig
>>>> combinations.
>>>
>>>
>>> Indeed. Recently I discovered IS_ENABLED() and started recommending it
>>> to people for new code. But now I've seen the CONFIG_NUMA breakage,
>>> I no longer think this is a good recommendation.
>>
>> adding Michal & linux-kbuild to cc: list.
>>
> I do not really see any way to fix this, beside having a unique
> architecture-wide configuration namespace :/
Having a single namespace, or less ambitiously, having less
arch-specific config symbol definitions, would be a plus. IS_ENABLED
requiring the symbol to be defined is not bad per se, it prevents typos.
Michal
^ permalink raw reply
* Re: [PATCH] powerpc/of: add OF_DYNAMIC for chroma
From: Jimi Xenidis @ 2012-02-20 14:12 UTC (permalink / raw)
To: Michael Neuling; +Cc: grant.likely, linux-next, linuxppc-dev, benh
In-Reply-To: <5145.1329691681@neuling.org>
On Feb 19, 2012, at 4:48 PM, Michael Neuling wrote:
> linux next-20120217 compiling ppc64e_defconfig fails with:
>
> arch/powerpc/platforms/wsp/h8.c: In function 'wsp_h8_getaddr':
> arch/powerpc/platforms/wsp/h8.c:116: error: implicit declaration of function 'of_detach_node'
>
> The below fixes this by selecting the new OF_DYNAMIC when PPC_CHROMA.
>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Jimi Xenidis <jimix@pobox.com>
>
> diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
> index 57d22a2..79d2225 100644
> --- a/arch/powerpc/platforms/wsp/Kconfig
> +++ b/arch/powerpc/platforms/wsp/Kconfig
> @@ -25,6 +25,7 @@ config PPC_CHROMA
> bool "PowerEN PCIe Chroma Card"
> select EPAPR_BOOT
> select PPC_WSP
> + select OF_DYNAMIC
> default y
>
> endmenu
^ permalink raw reply
* [PATCH -next] ext4: get rid of compile warning
From: Heiko Carstens @ 2012-02-20 12:56 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-next
Get rid of this one:
fs/ext4/balloc.c: In function 'ext4_wait_block_bitmap':
fs/ext4/balloc.c:405:3: warning: format '%llu' expects argument of
type 'long long unsigned int', but argument 6 has type 'sector_t' [-Wformat]
Happens because sector_t is u64 (unsigned long long) or unsigned long
dependent on CONFIG_64BIT.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
fs/ext4/balloc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 95c87ab..c355890 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -404,7 +404,7 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group,
if (!buffer_uptodate(bh)) {
ext4_error(sb, "Cannot read block bitmap - "
"block_group = %u, block_bitmap = %llu",
- block_group, bh->b_blocknr);
+ block_group, (unsigned long long) bh->b_blocknr);
return 1;
}
/* Panic or remount fs read-only if block bitmap is invalid */
--
1.7.9.1
^ permalink raw reply related
* Re: linux-next: manual merge of the remoteproc tree with the scsi tree
From: Ohad Ben-Cohen @ 2012-02-20 7:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paolo Bonzini, James Bottomley,
Rusty Russell
In-Reply-To: <20120220150215.68e88ae1bf96e5790ecd19fd@canb.auug.org.au>
On Mon, Feb 20, 2012 at 6:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks a lot, Stephen.
^ permalink raw reply
* linux-next: Tree for Feb 20
From: Stephen Rothwell @ 2012-02-20 5:59 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 41598 bytes --]
Hi all,
Changes since 20120217:
The net-next tree lost a conflict but gained a build failure for which I
reverted a commit.
The rr tree lost its build failures.
The fbdev tree lost its build failure.
The staging tree lost its build failure.
The remoteproc tree gained a conflict against the scsi tree.
The akpm tree lost some patches that turned up elsewhere, gained a
conflict against Linus' tree, lost a patch that was causing build
failures and still has a couple of build failure for which I reverted a
patch and 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/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 182 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.
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 (b01543d Linux 3.3-rc4)
Merging fixes/master (2b79574 tty/powerpc: early udbg consoles can't be modules)
Merging kbuild-current/rc-fixes (6c63522 builddeb: Don't create files in /tmp with predictable names)
Merging arm-current/fixes (fee6a3c ARM: 7327/1: need to include asm/system.h in asm/processor.h)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (9a45a94 powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
Merging scsi-rc-fixes/master (fea6d60 [SCSI] scsi_pm: Fix bug in the SCSI power management handler)
Merging net/master (b01543d Linux 3.3-rc4)
Merging sound-current/for-linus (27c3afe ALSA: intel8x0: Fix default inaudible sound on Gateway M520)
Merging pci-current/for-linus (3682a39 PCI: Fix pci cardbus removal)
Merging wireless/master (2504a64 ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status)
Merging driver-core.current/driver-core-linus (29bb5d4 driver-core: cpu: fix kobject warning when hotplugging a cpu)
Merging tty.current/tty-linus (19e00f2 Merge tag 'tty-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty)
Merging usb.current/usb-linus (b9e44fe USB: option: cleanup zte 3g-dongle's pid in option.c)
Merging staging.current/staging-linus (b01543d Linux 3.3-rc4)
Merging char-misc.current/char-misc-linus (b5266ea mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip)
Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging input-current/for-linus (82b982c Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist)
Merging md-current/for-linus (db91ff5 md: two small fixes to handling interrupt resync.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (f2ea0f5 crypto: sha512 - use standard ror64())
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (2261cc6 dt: add empty of_find_compatible_node function)
Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (41bc99e Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (e8a4c2f Merge branch 'v3.4-for-rafael' into for-next)
Merging tegra/for-next (9048201 Merge branch 'for-3.4/soc-drivers' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls)
Merging c6x/for-linux-next (62e37ca Kbuild: Use dtc's -d (dependency) option)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (0f261ed [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler())
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (9720227 m68knommu: clean up linker script)
Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6)
Merging mips/mips-for-linux-next (8551715 Merge branches 'fixes-for-linus' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (754d5c2 openrisc: Set shortest clock event to 100 ticks)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging s390/features (486f0b4 [S390] irq: external interrupt code passing)
Merging sparc-next/master (b409650 arch/sparc/kernel/unaligned_64.c: included linux/bitops.h twice)
Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/for-next (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
Merging cifs/master (4903062 i387: move AMD K7/K8 fpu fxsave/fxrstor workaround from save to restore)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (62aa2b5 Linux 3.3-rc2)
Merging ext4/dev (d2403ca ext4: using PTR_ERR() on the wrong variable in ext4_ext_migrate())
Merging fuse/for-next (03c9693 cuse: implement memory mapping)
Merging gfs2/master (2b86c11 GFS2: Ensure rindex is uptodate for fallocate)
Merging logfs/master (3b582f3 Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent)
Merging nfs/linux-next (36925a2 Merge branch 'nfs-for-next' into linux-next)
Merging nfsd/nfsd-next (03cfb42 NFSD: Clean up the test_stateid function)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files)
Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.)
Merging ubifs/linux-next (72d3ef6 UBIFS: do not use inc_link when i_nlink is zero)
Merging xfs/for-next (f65020a XFS: xfs_trans_add_item() - don't assign in ASSERT() when compare is intended)
Merging vfs/for-next (9a3b4c1 qnx4fs: small cleanup)
Merging pci/linux-next (5b415f1 PCI / PM: Disable wakeup during shutdown for devices not enabled to wake up)
Merging hid/for-next (9d23d8a Merge branch 'upstream' into for-next)
Merging quilt/i2c (c3632e0 i2c-i801: Use usleep_range to wait for command completion)
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 quilt/jdelvare-hwmon (127e71e hwmon: (mc13xxx-adc) Add support for the MC13892 PMIC)
Merging hwmon-staging/hwmon-next (de69184 hwmon: (hwmon-vid) Fix checkpatch issues)
Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (d345066 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (75cb742 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 (96c4d29 pata_legacy: correctly mask recovery field for HT6560B)
Merging infiniband/for-next (715252d IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring())
Merging acpi/next (eb7004e Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release)
Merging ieee1394/for-next (6e01490 Merge branch 'fixes' into for-next)
Merging ubi/linux-next (ecaabdb UBI: fix error handling in ubi_scan())
Merging dlm/next (60f98d1 dlm: add recovery callbacks)
Merging scsi/master (50824d6 [SCSI] libsas: async ata-eh)
Merging target-updates/for-next (24d2f08 tcm_fc: Remove cmd->cdb data member)
Merging target-merge/for-next-merge (d65b4e9 Linux 3.3-rc3)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (57872c2 Merge branches 'devel' and 'fixes' into all)
CONFLICT (content): Merge conflict in include/scsi/sas_ata.h
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_port.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_event.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h
Merging slave-dma/next (b63fd6c i.MX SDMA: Fix burstsize settings)
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (32efe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
CONFLICT (content): Merge conflict in net/mac80211/sta_info.h
CONFLICT (content): Merge conflict in net/mac80211/debugfs_sta.c
Merging wireless-next/master (ca994a3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
CONFLICT (content): Merge conflict in net/mac80211/sta_info.h
CONFLICT (content): Merge conflict in net/mac80211/debugfs_sta.c
Merging bluetooth/master (c5993de Bluetooth: Correct packet len calculation)
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (783dbd6 sfc: mtd: Use MTD_FAIL_ADDR_UNKNOWN instead of 0xffffffff)
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
Merging crypto/master (d97055e Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging sound/for-next (34363ab Merge branch 'topic/hda' into for-next)
Merging sound-asoc/for-next (e074b94 Merge branch 'for-3.4' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c
Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes)
Merging quilt/rr (42d5bdd virtio: update documentation to v0.9.4 of spec)
Merging input/next (023cea0 Input: tegra-kbc - allow skipping setting up some of GPIO pins)
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next)
Merging quilt/device-mapper (1e5f0da Commit unwritten data every second to prevent too much building up. In future we might make the commit interval tunable.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent)
Merging mmc/mmc-next (25d6ba8 ARM: OMAP: hsmmc: add max_freq field)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (96438bc Merge branch 'slub/cleanups' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (fae8cc5 md/raid10: fix handling of error on last working device in array.)
Merging mfd/for-next (fa884b5 mfd: twl-core: Don't specify regulator consumers by struct device)
Merging drm/drm-next (019d96c drm: add some caps for userspace to discover more info for dumb KMS driver (v2))
Merging fbdev/fbdev-next (94f61a7 i740fb: fix compile error when CONFIG_MTRR is not selected)
Merging viafb/viafb-next (c572c8b viafb: NULL dereference on allocation failure in query_edid())
Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up)
Merging regulator/for-next (6b15e02 Merge branch 'regulator-supply' into regulator-next)
Merging security/next (b0d5de4 IMA: fix audit res field to indicate 1 for success and 0 for failure)
Merging selinux/master (a9ab18a selinux: include flow.h where used rather than get it indirectly)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (1776b7d watchdog: fix error in probe() of s3c2410_wdt (reset at booting))
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (48d2116 Merge branches 'iommu/fixes' and 'arm/tegra' into next)
Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (2105b9a Only include linux/sched.h once in arch/arm/mach-bcmring/dma.c)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (98f7e95 PM / Hibernate: Enable usermodehelpers in hibernate() error path)
Merging apm/for-next (b4a133d 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 edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (5a42394 Merge remote-tracking branch 'kepek/3.3-edac-dbam' into edac-for-next)
Merging devicetree/devicetree/next (301b605 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support)
Merging gpio/gpio/next (ff64abe of_gpio: add support of of_gpio_named_count to be able to count named gpio)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging tip/auto-latest (630e0fd Merge branch 'x86/urgent' into auto-latest)
Merging rcu/rcu/next (710fbb1 cpuidle: Inform RCU of read-side critical sections)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (4e44798 perf: perf interface for uprobes)
CONFLICT (content): Merge conflict in tools/perf/util/probe-event.c
CONFLICT (content): Merge conflict in tools/perf/builtin-probe.c
Merging cgroup/for-next (761b3ef cgroup: remove cgroup_subsys argument from callbacks)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (4b99f72 KVM: mmu_notifier: Flush TLBs before releasing mmu_lock)
Merging oprofile/for-next (b9e7f8e Merge branches 'oprofile/urgent' and 'oprofile/core' into oprofile/master)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (53eaea0 Merge branch 'stable/for-linus-fixes-3.3' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (26dd8e0 percpu: use bitmap_clear)
Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.)
CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c
Merging regmap/for-next (ac633d6 Merge branch 'regmap-core' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (8bf1193 intel_idle: Revert change of auto_demotion_disable_flags for Nehalem)
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (6816383 tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h)
Merging usb/usb-next (5407a3c usb: host: ehci: allow ehci_* symbols to be unused)
Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next)
Applying: mm: frontswap: update for security_vm_enough_memory API change
Merging staging/staging-next (3e80914 Staging: ramster: mark BROKEN)
Merging char-misc/char-misc-next (838d51b char: Fix typo in tlclk.c)
Merging arm-soc/for-next (8a6b82f Merge branch 'next/fixes-non-critical' into for-next)
Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue)
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 (6bc70b4 Merge branch 'pinctrl-tegra-for-next-diet' into for-next)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
Merging kmap_atomic/kmap_atomic (019e9ad feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c
CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6c7b643 remoteproc: s/big switch/lookup table/)
CONFLICT (content): Merge conflict in include/linux/virtio_ids.h
Merging irqdomain/irqdomain/next (2462bac irq_domain/microblaze: Convert microblaze to use irq_domains)
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/common/gic.c
Merging kvmtool/master (8bff3eb kvm tools: Add guest/init_stage2 to .gitignore)
Merging dma-mapping/dma-mapping-next (e972541 common: DMA-mapping: add NON-CONSISTENT attribute)
Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: kmsg_dump: don't run on non-error paths by default
Applying: kprobes: return proper error code from register_kprobe()
Applying: aio: wake up waiters when freeing unused kiocbs
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs
Applying: geos: platform driver for Geos and Geos2 single-board computers
Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver()
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: platform, x86: kill off Moorestown
Applying: intel_scu_ipc: remove Moorestown support
Applying: platform-x86: intel_mid_thermal: add msic_thermal alias
Applying: platform-x86: intel_mid_thermal: convert to use Intel MSIC API
Applying: platform-x86: intel_mid_thermal: turn off thermistor voltage by default
Applying: intel_mid_powerbtn: use MSIC read/write instead of ipc_scu
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: x86, olpc: add debugfs interface for EC commands
Applying: x86, mm: fix the size calculation of mapping tables
Applying: alix2: supplement driver to include GPIO button support
Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: arm: use set_current_blocked() and block_sigmask()
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: fs/btrfs/inode-map.c: fix warnings
Applying: powerpc: use set_current_blocked() and block_sigmask()
Applying: Hexagon: use set_current_blocked() and block_sigmask()
Applying: irqs: fix long-term regression in genirq irq_set_irq_type() handling
Applying: irqs: fix handling of pending IRQs at request time
Applying: softirq: reduce invoke_softirq() code duplication
Applying: tile: use set_current_blocked() and block_sigmask()
Applying: hrtimers: Special-case zero length sleeps
Applying: cs5535-clockevt: don't ignore MFGPT on SMP-capable kernels
Applying: cs5535-clockevt: allow the MFGPT IRQ to be shared
Applying: hpet: factor timer allocate from open
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/thermal_sys.c: fix build warning
Applying: thermal_sys: remove unnecessary line continuations
Applying: thermal_sys: remove obfuscating used-once macros
Applying: thermal_sys: kernel style cleanups
Applying: thermal_sys: convert printks to pr_<level>
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6]
Applying: debugobjects: Fix selftest for static warnings
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: S390: use block_sigmask()
Applying: xtensa: don't reimplement force_sigsegv()
Applying: xtensa: no need to reset handler if SA_ONESHOT
Applying: xtensa: don't mask signals if we fail to setup signal stack
Applying: xtensa: use set_current_blocked() and block_sigmask()
Applying: slab: introduce kmalloc_array()
Applying: sparc: use block_sigmask()
Applying: mm, oom: avoid looping when chosen thread detaches its mm
Applying: mm, oom: fold oom_kill_task() into oom_kill_process()
Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting
Applying: mm, oom: introduce independent oom killer ratelimit state
Applying: mm: add rss counters consistency check
Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/
Applying: mm: make get_mm_counter static-inline
Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()
Applying: mm: make swapin readahead skip over holes
Applying: make-swapin-readahead-skip-over-holes-fix
Applying: vmscan: reclaim at order 0 when compaction is enabled
Applying: vmscan: kswapd carefully call compaction
Applying: vmscan-kswapd-carefully-call-compaction-fix
Applying: vmscan: only defer compaction for failed order and higher
Applying: compact_pgdat: workaround lockdep warning in kswapd
Applying: mm: compaction: make compact_control order signed
Applying: mm-compaction-make-compact_control-order-signed-fix
Applying: hugetlbfs: fix hugetlb_get_unmapped_area()
Applying: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()
Applying: hugetlb: try to search again if it is really needed
Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix
Applying: mm: do not reset cached_hole_size when vma is unmapped
Applying: mm: search from free_area_cache for the bigger size
Applying: pagemap: avoid splitting thp when reading /proc/pid/pagemap
Applying: thp: optimize away unnecessary page table locking
Applying: pagemap: export KPF_THP
Applying: pagemap: document KPF_THP and make page-types aware of it
Applying: pagemap: introduce data structure for pagemap entry
Applying: mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
Applying: mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem
Applying: mm: hugetlb: defer freeing pages when gathering surplus pages
Applying: mm: replace COMPACTION_BUILD with IS_ENABLED(CONFIG_COMPACTION)
Applying: mm-replace-compaction_build-with-is_enabledconfig_compaction-fix
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: memcg: replace MEM_CONT by MEM_RES_CTLR
Applying: memcg: replace mem and mem_cont stragglers
Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT
Applying: memcg: enum lru_list lru
Applying: memcg: remove redundant returns
Applying: memcg: remove unnecessary thp check in page stat accounting
Applying: idr: make idr_get_next() good for rcu_read_lock()
Applying: cgroup: revert ss_id_lock to spinlock
Applying: memcg: let css_get_next() rely upon rcu_read_lock()
Applying: memcg: remove PCG_CACHE page_cgroup flag
Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes
Applying: memcg: kill dead prev_priority stubs
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: sh: no need to reset handler if SA_ONESHOT
Applying: sh: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: alpha: use set_current_blocked() and block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: C6X: use set_current_blocked() and block_sigmask()
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: um: don't restore current->blocked on error
Applying: um: use set_current_blocked() and block_sigmask()
Applying: magic.h: move some FS magic numbers into magic.h
Applying: nmi watchdog: do not use cpp symbol in Kconfig
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix
Applying: kernel/exit.c: if init dies, log a signal which killed it, if any
Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix
Applying: posix_types: make __kernel_[ug]id32_t default to unsigned int
Applying: posix_types: make it possible to override __kernel_fsid_t
Applying: alpha: use generic posix_types.h
Applying: arm: use generic posix_types.h
Applying: avr32: use generic posix_types.h
Applying: cris: use generic posix_types.h
Applying: frv: use generic posix_types.h
Applying: h8300: use generic posix_types.h
Applying: ia64: use generic posix_types.h
Applying: m32r: use generic posix_types.h
Applying: m68k: use generic posix_types.h
Applying: mips: use generic posix_types.h
Applying: mn10300: use generic posix_types.h
Applying: parisc: use generic posix_types.h
Applying: powerpc: use generic posix_types.h
Applying: s390: use generic posix_types.h
Applying: sh: remove unnecessary posix_types.h type overrides
Applying: sparc: use generic posix_types.h
Applying: x86: use generic posix_types.h
Applying: xtensa: use generic posix_types.h
Applying: posix_types: remove fd_set macros
Applying: posix_types-remove-fd_set-macros-checkpatch-fixes
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: brlocks-lglocks-cleanups-checkpatch-fixes
Applying: vfs: correctly set the dir i_mutex lockdep class
Applying: seq_file: fix mishandling of consecutive pread() invocations.
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: MAINTAINERS: Update MCA section
Applying: MAINTAINERS: update git urls for 2.6 deletions
Applying: backlight: convert backlight i2c drivers to module_i2c_driver
Applying: backlight: convert backlight spi drivers to module_spi_driver
Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions
Applying: drivers/video/backlight: use devm_ functions
Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions
Applying: backlight: new backlight driver for LP855x devices
Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path
Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe()
Applying: backlight/lp855x_bl.c: small cleanups
Applying: backlight: add driver for Bachmann's ot200
Applying: backlight-add-driver-for-bachmanns-ot200-fix
Applying: backlight: add support for Pandora backlight
Applying: backlight-add-support-for-pandora-backlight-v2
Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
Applying: bitops: remove for_each_set_bit_cont()
Applying: bitops: introduce for_each_clear_bit()
Applying: mtd: use for_each_clear_bit()
Applying: s390/char: use for_each_clear_bit()
Applying: uwb: use for_each_clear_bit()
Applying: x86: use for_each_clear_bit_from()
Applying: drivers/leds/leds-lp5521.c: fix typo
Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config
Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data
Applying: drivers/leds/leds-lp5521.c: support led pattern data
Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes
Applying: drivers/leds/leds-lp5521.c: redefinition of register bits
Applying: drivers/leds/leds-lp5523.c: constify some data
Applying: drivers/leds: add driver for PCA9633 I2C chip
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2
Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h
Applying: leds-lm3530: set the max_brightness to 127
Applying: leds-lm3530: replace i2c_client with led_classdev
Applying: leds-lm3530-replace-i2c_client-with-led_classdev-fix
Applying: leds-lm3530: support pwm input mode
Applying: leds-lm3530: remove LM3530_ALS_ZONE_REG code
Applying: leds-lm3530: replace pltfm with pdata
Applying: drivers/leds/leds-pca9633.c: remove unused 'adapter' variable
Applying: drivers/leds/leds-lm3530.c: move the code setting gen_config to one place
Applying: drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix
Applying: string: memchr_inv speed improvements
Applying: prio_tree: remove unnecessary code in prio_tree_replace
Applying: prio_tree: cleanup prio_tree_left()/prio_tree_right()
Applying: prio_tree: simplify prio_tree_expand()
Applying: prio_tree: introduce prio_set_parent()
Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
Applying: crc32: remove two instances of trailing whitespaces
Applying: crc32: move long comment about crc32 fundamentals to Documentation/
Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix
Applying: crc32: simplify unit test code
Applying: crc32: miscellaneous cleanups
Applying: crc32: fix mixing of endian-specific types
Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts
Applying: crc32: add slice-by-8 algorithm to existing code
Applying: crc32: optimize loop counter for x86
Applying: crc32: add note about this patchset to crc32.c
Applying: crc32: bolt on crc32c
Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode
Applying: crypto: crc32c should use library implementation
Applying: crc32: add self-test code for crc32c
Applying: crc32: select an algorithm via Kconfig
Applying: epoll: comment the funky #ifdef
Applying: init/do_mounts.c: create /root if it does not exist
Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt
Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors
Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
Applying: rtc: convert rtc spi drivers to module_spi_driver
Applying: rtc: convert rtc i2c drivers to module_i2c_driver
Applying: MIPS: add RTC support for loongson1B
Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access
Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state
Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing
Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR
Applying: drivers/rtc: remove IRQF_DISABLED
Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error
Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm
Applying: rtc: driver for DA9052/53 PMIC v1
Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix
Applying: ptrace: the killed tracee should not enter the syscall
Applying: ptrace: don't send SIGTRAP on exec if SEIZED
Applying: ptrace: don't modify flags on PTRACE_SETOPTIONS failure
Applying: ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code
Applying: ptrace: make PTRACE_SEIZE set ptrace options specified in 'data' parameter
Applying: ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match
Applying: ptrace: remove PTRACE_SEIZE_DEVEL bit
Applying: signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
Applying: signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
Applying: signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
Applying: signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
Applying: usermodehelper: use UMH_WAIT_PROC consistently
Applying: usermodehelper: introduce umh_complete(sub_info)
Applying: usermodehelper: implement UMH_KILLABLE
Applying: usermodehelper: kill umh_wait, renumber UMH_* constants
Applying: usermodehelper: ____call_usermodehelper() doesn't need do_exit()
Applying: kmod: introduce call_modprobe() helper
Applying: kmod: make __request_module() killable
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
Applying: proc: speedup /proc/stat handling
Applying: procfs: add num_to_str() to speed up /proc/stat
Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix
Applying: procfs: avoid breaking the ABI in /proc/stat
Applying: procfs: speed up /proc/pid/stat, statm
Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes
Applying: proc: clean up /proc/<pid>/environ handling
Applying: seq_file: add seq_set_overflow(), seq_overflow()
Applying: seq_file-add-seq_set_overflow-seq_overflow-fix
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9
Applying: lib/cpumask.c: remove __any_online_cpu()
Applying: arch/ia64: remove references to cpu_*_map
Applying: cpumask: avoid mask based num_possible_cpus() and num_online_cpus()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc: provide generic compat versions of IPC syscalls
Applying: ipmi: decrease the IPMI message transaction time in interrupt mode
Applying: ipmi: increase KCS timeouts
Applying: ipmi: use a tasklet for handling received messages
Applying: ipmi: fix message handling during panics
Applying: ipmi: simplify locking
Applying: ipmi: use locks on watchdog timeout set on reboot
Applying: sysctl: use bitmap library functions
Applying: pidns: add reboot_pid_ns() to handle the reboot syscall
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes
Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
Applying: selftests: launch individual selftests from the main Makefile
Applying: selftests/Makefile: make `run_tests' depend on `all'
Applying: mm: move page-types.c from Documentation to tools/vm
Applying: mm: move slabinfo.c to tools/vm
Applying: mm: move hugepage test examples to tools/testing/selftests/vm
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix
Merging akpm (f8e4ed3 syscalls-x86-add-__nr_kcmp-syscall-v8-fix)
[master ee93a5a] Revert "posix_types-remove-fd_set-macros-checkpatch-fixes"
[master 3e9b94f] Revert "posix_types: remove fd_set macros"
Applying: powerpc: use generic posix_types.h fix
[master d6e4ac7] Revert "xilinx ll_temac: use eth_hw_addr_random() instead of random_ether_addr()"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: David Miller @ 2012-02-20 5:46 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, danny.kukawka
In-Reply-To: <20120220161545.0078a76d8050c56955427455@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Feb 2012 16:15:45 +1100
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_set_mac_address':
> drivers/net/ethernet/xilinx/ll_temac_main.c:332:3: error: 'dev' undeclared (first use in this function)
>
> Caused by commit 5a5e7c364486 ("xilinx ll_temac: use eth_hw_addr_random()
> instead of random_ether_addr()").
>
> I have reverted that commit for today.
I've fixed it as follows:
--------------------
ll_temac: Fix build.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index eb28541..d21591a 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -329,7 +329,7 @@ static int temac_set_mac_address(struct net_device *ndev, void *address)
if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev);
else
- dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+ ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
/* set up unicast MAC address filter set its mac address */
mutex_lock(&lp->indirect_mutex);
--
1.7.7.6
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2012-02-20 5:15 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Danny Kukawka
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_set_mac_address':
drivers/net/ethernet/xilinx/ll_temac_main.c:332:3: error: 'dev' undeclared (first use in this function)
Caused by commit 5a5e7c364486 ("xilinx ll_temac: use eth_hw_addr_random()
instead of random_ether_addr()").
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the scsi-post-merge tree with Linus' tree
From: Stephen Rothwell @ 2012-02-20 4:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/process_32.c between commit 34ddc81a230b ("i387:
re-introduce FPU state preloading at context switch time") from Linus'
tree and commit "x86: use this_cpu_xxx to replace percpu_xxx funcs" from
the akpm 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/x86/kernel/process_32.c
index 80bfe1a,6acfb80..0000000
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -358,9 -377,7 +358,9 @@@ __switch_to(struct task_struct *prev_p
if (prev->gs | next->gs)
lazy_load_gs(next->gs);
+ switch_fpu_finish(next_p, fpu);
+
- percpu_write(current_task, next_p);
+ __this_cpu_write(current_task, next_p);
return prev_p;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the remoteproc tree with the scsi tree
From: Stephen Rothwell @ 2012-02-20 4:02 UTC (permalink / raw)
To: Ohad Ben-Cohen
Cc: linux-next, linux-kernel, Paolo Bonzini, James Bottomley,
Rusty Russell
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Ohad,
Today's linux-next merge of the remoteproc tree got a conflict in
include/linux/virtio_ids.h between commit 4fe74b1cb051 ("[SCSI]
virtio-scsi: SCSI driver for QEMU based virtual machines") from the scsi
tree and commit bcabbccabffe ("rpmsg: add virtio-based remote processor
messaging bus") from the remoteproc 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 include/linux/virtio_ids.h
index c5d8455,b37c521..0000000
--- a/include/linux/virtio_ids.h
+++ b/include/linux/virtio_ids.h
@@@ -34,7 -34,7 +34,8 @@@
#define VIRTIO_ID_CONSOLE 3 /* virtio console */
#define VIRTIO_ID_RNG 4 /* virtio ring */
#define VIRTIO_ID_BALLOON 5 /* virtio balloon */
+ #define VIRTIO_ID_RPMSG 7 /* virtio remote processor messaging */
+#define VIRTIO_ID_SCSI 8 /* virtio scsi */
#define VIRTIO_ID_9P 9 /* 9p virtio console */
#endif /* _LINUX_VIRTIO_IDS_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] params: Fix parse_args() use in PowerPC's reserve_hugetlb_gpages()
From: Rusty Russell @ 2012-02-20 1:26 UTC (permalink / raw)
Cc: Michael Neuling, galak, Becky Bruce, linux-next, linuxppc-dev,
McClintock Matthew-B29882, Stephen Rothwell, Pawel Moll
In-Reply-To: <1329494916-20575-1-git-send-email-pawel.moll@arm.com>
On Fri, 17 Feb 2012 16:08:36 +0000, Pawel Moll <pawel.moll@arm.com> wrote:
> Commit b8076966e8e1 ("params: <level>_initcall-like kernel parameters")
> changed the parse_args() API without fixing all the callers. Done now.
>
> Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Thanks Stephen, Pawel.
Applied,
Rusty.
^ permalink raw reply
* Re: [PATCH] mm: add config NUMA stub to all architectures
From: Arnaud Lacombe @ 2012-02-19 23:21 UTC (permalink / raw)
To: Randy Dunlap
Cc: Geert Uytterhoeven, Andrew Morton, Konstantin Khlebnikov,
Stephen Rothwell, linux-next, LKML, Sam Ravnborg, Michal Marek,
linux-kbuild
In-Reply-To: <4F413B8D.5080307@xenotime.net>
Hi,
On Sun, Feb 19, 2012 at 1:12 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On 02/19/2012 09:01 AM, Geert Uytterhoeven wrote:
>>
>> On Fri, Feb 17, 2012 at 21:30, Andrew Morton<akpm@linux-foundation.org>
>> wrote:
>>>
>>> On Fri, 17 Feb 2012 16:08:15 +0400
>>> Konstantin Khlebnikov<khlebnikov@openvz.org> wrote:
>>>
>>>> Config NUMA must be defined for all architectures,
>>>> otherwise IS_ENABLED(CONFIG_NUMA) does not work.
>>>> Some arch-specific Kconfig already has this stub.
>>>> This patch adds it to all remaining.
>>>
>>>
>>> It would be better to teach IS_ENABLED() to handle this situation. I
>>> don't think there's a way of doing this with cpp :(
>>>
>>> This limitation makes IS_ENABLED pretty dangerous, doesn't it? It
>>> makes it very easy to introduce build breakage with unexpected Kconfig
>>> combinations.
>>
>>
>> Indeed. Recently I discovered IS_ENABLED() and started recommending it
>> to people for new code. But now I've seen the CONFIG_NUMA breakage,
>> I no longer think this is a good recommendation.
>
> adding Michal & linux-kbuild to cc: list.
>
I do not really see any way to fix this, beside having a unique
architecture-wide configuration namespace :/
- Arnaud
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: Andrew Morton @ 2012-02-19 23:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Konstantin Khlebnikov
In-Reply-To: <20120220100436.5fbbf5cc1b1df539ed8aca24@canb.auug.org.au>
On Mon, 20 Feb 2012 10:04:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> On Fri, 17 Feb 2012 21:20:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next fails to build (s390 allnoconfig) like this:
> >
> > In file included from arch/s390/mm/maccess.c:15:
> > include/linux/gfp.h: In function 'gfp_zonelist':
> > include/linux/gfp.h:267: error: '__enabled_CONFIG_NUMA' undeclared (first use in this function)
> > include/linux/gfp.h:267: error: (Each undeclared identifier is reported only once
> > include/linux/gfp.h:267: error: for each function it appears in.)
> > include/linux/gfp.h:267: error: '__enabled_CONFIG_NUMA_MODULE' undeclared (first use in this function)
> >
> > and many more. This also happens in other architectures and configs but
> > (obviously) not all builds.
> >
> > Presumably caused by commit 053361e1a072 ("mm: replace NUMA_BUILD with
> > IS_ENABLED(CONFIG_NUMA)").
>
> I have removed that patch from the akpm tree until a solution is worked out.
>
> Everything seemed to rebase ok with out it and I can't see much actually
> depending on it.
yup, I've removed it from the for-next sections and will probably drop
it altogether.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2012-02-19 23:04 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, LKML, Konstantin Khlebnikov
In-Reply-To: <20120217212037.0859c427418b73b2cb17428d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
Hi Andrew,
On Fri, 17 Feb 2012 21:20:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next fails to build (s390 allnoconfig) like this:
>
> In file included from arch/s390/mm/maccess.c:15:
> include/linux/gfp.h: In function 'gfp_zonelist':
> include/linux/gfp.h:267: error: '__enabled_CONFIG_NUMA' undeclared (first use in this function)
> include/linux/gfp.h:267: error: (Each undeclared identifier is reported only once
> include/linux/gfp.h:267: error: for each function it appears in.)
> include/linux/gfp.h:267: error: '__enabled_CONFIG_NUMA_MODULE' undeclared (first use in this function)
>
> and many more. This also happens in other architectures and configs but
> (obviously) not all builds.
>
> Presumably caused by commit 053361e1a072 ("mm: replace NUMA_BUILD with
> IS_ENABLED(CONFIG_NUMA)").
I have removed that patch from the akpm tree until a solution is worked out.
Everything seemed to rebase ok with out it and I can't see much actually
depending on it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH] powerpc/of: add OF_DYNAMIC for chroma
From: Michael Neuling @ 2012-02-19 22:48 UTC (permalink / raw)
To: Jimi Xenidis, grant.likely; +Cc: linux-next, linuxppc-dev, benh
linux next-20120217 compiling ppc64e_defconfig fails with:
arch/powerpc/platforms/wsp/h8.c: In function 'wsp_h8_getaddr':
arch/powerpc/platforms/wsp/h8.c:116: error: implicit declaration of function 'of_detach_node'
The below fixes this by selecting the new OF_DYNAMIC when PPC_CHROMA.
Signed-off-by: Michael Neuling <mikey@neuling.org>
diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
index 57d22a2..79d2225 100644
--- a/arch/powerpc/platforms/wsp/Kconfig
+++ b/arch/powerpc/platforms/wsp/Kconfig
@@ -25,6 +25,7 @@ config PPC_CHROMA
bool "PowerEN PCIe Chroma Card"
select EPAPR_BOOT
select PPC_WSP
+ select OF_DYNAMIC
default y
endmenu
^ permalink raw reply related
* Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller @ 2012-02-19 22:41 UTC (permalink / raw)
To: sfr; +Cc: yuvalmin, netdev, linux-next, linux-kernel, eilong, eric.dumazet
In-Reply-To: <20120217103011.b2223e28a89839d09a4a4053@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Feb 2012 10:30:11 +1100
> Hi,
>
> On Thu, 16 Feb 2012 13:24:10 +0200 "Yuval Mintz" <yuvalmin@broadcom.com> wrote:
>>
>> I don't fully understand your merge - it seems to create a mash between
>> the "bnx2x: fix bnx2x_storm_stats_update() on big endian" patch in net,
>> and the "bnx2x: consistent statistics after internal driver reload"
>> patch in net-next.
>
> That is exactly what the merge conflict resolution did. i.e. the patch
> you supplied below is not needed in linux-next because that is
> effectively what I did. It is the same as Dave will do when he merges
> the net tree into the net-next tree as well, I assume.
I've taken care of this.
^ permalink raw reply
* [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected
From: Florian Tobias Schandinat @ 2012-02-19 21:33 UTC (permalink / raw)
To: linux-fbdev
Cc: linux-kernel, Florian Tobias Schandinat, Ondrej Zary,
Stephen Rothwell, linux-next
In-Reply-To: <20120216162900.e2dd164732084f48e5b239f0@canb.auug.org.au>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---
drivers/video/i740fb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
index 8be0302..fe574d8 100644
--- a/drivers/video/i740fb.c
+++ b/drivers/video/i740fb.c
@@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev *dev)
struct fb_info *info = pci_get_drvdata(dev);
if (info) {
-#ifdef CONFIG_MTRR
struct i740fb_par *par = info->par;
+#ifdef CONFIG_MTRR
if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0);
par->mtrr_reg = -1;
--
1.7.2.5
^ permalink raw reply related
* (unknown),
From: Robert Walter @ 2012-02-19 14:03 UTC (permalink / raw)
>From Robert Walter (For Trustees)
Managing Partner (Stevens & Walter)
London - United Kingdom.
Notification of Bequest
On behalf of Stevens and Walter Chambers, Trustees and Executors of the estate of Late Kaiser Hartmann, I once again try to notify you as my earlier letter was returned undelivered. I hereby attempt to reach you again by this same email address.
Please if I reach you, as I am hopeful, endeavor to get back to me as soon as possible for further details.
I look forward to your prompt response.
Yours sincerely,
Robert Walter
^ permalink raw reply
* Re: [PATCH] mm: add config NUMA stub to all architectures
From: Randy Dunlap @ 2012-02-19 18:12 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Andrew Morton, Konstantin Khlebnikov, Stephen Rothwell,
linux-next, LKML, Sam Ravnborg, Michal Marek, linux-kbuild
In-Reply-To: <CAMuHMdUYCGoZoUHWMtMCwAJ2ofweaeLF3U89P5EvrNGcn=6apw@mail.gmail.com>
On 02/19/2012 09:01 AM, Geert Uytterhoeven wrote:
> On Fri, Feb 17, 2012 at 21:30, Andrew Morton<akpm@linux-foundation.org> wrote:
>> On Fri, 17 Feb 2012 16:08:15 +0400
>> Konstantin Khlebnikov<khlebnikov@openvz.org> wrote:
>>
>>> Config NUMA must be defined for all architectures,
>>> otherwise IS_ENABLED(CONFIG_NUMA) does not work.
>>> Some arch-specific Kconfig already has this stub.
>>> This patch adds it to all remaining.
>>
>> It would be better to teach IS_ENABLED() to handle this situation. I
>> don't think there's a way of doing this with cpp :(
>>
>> This limitation makes IS_ENABLED pretty dangerous, doesn't it? It
>> makes it very easy to introduce build breakage with unexpected Kconfig
>> combinations.
>
> Indeed. Recently I discovered IS_ENABLED() and started recommending it
> to people for new code. But now I've seen the CONFIG_NUMA breakage,
> I no longer think this is a good recommendation.
adding Michal & linux-kbuild to cc: list.
--
~Randy
^ permalink raw reply
* Re: [PATCH] mm: add config NUMA stub to all architectures
From: Geert Uytterhoeven @ 2012-02-19 17:01 UTC (permalink / raw)
To: Andrew Morton
Cc: Konstantin Khlebnikov, Stephen Rothwell, linux-next, LKML,
Sam Ravnborg
In-Reply-To: <20120217123037.ecfc5dd9.akpm@linux-foundation.org>
On Fri, Feb 17, 2012 at 21:30, Andrew Morton <akpm@linux-foundation.org> wrote:
> On Fri, 17 Feb 2012 16:08:15 +0400
> Konstantin Khlebnikov <khlebnikov@openvz.org> wrote:
>
>> Config NUMA must be defined for all architectures,
>> otherwise IS_ENABLED(CONFIG_NUMA) does not work.
>> Some arch-specific Kconfig already has this stub.
>> This patch adds it to all remaining.
>
> It would be better to teach IS_ENABLED() to handle this situation. I
> don't think there's a way of doing this with cpp :(
>
> This limitation makes IS_ENABLED pretty dangerous, doesn't it? It
> makes it very easy to introduce build breakage with unexpected Kconfig
> combinations.
Indeed. Recently I discovered IS_ENABLED() and started recommending it
to people for new code. But now I've seen the CONFIG_NUMA breakage,
I no longer think this is a good recommendation.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* Re: linux-next: Tree for Feb 17 (kernel/kcmp.c)
From: Cyrill Gorcunov @ 2012-02-18 6:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Randy Dunlap, linux-next, LKML, Andrew Morton
In-Reply-To: <20120218101446.64a7ea590b66f337762bfb57@canb.auug.org.au>
On Sat, Feb 18, 2012 at 10:14:46AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 17 Feb 2012 10:00:23 -0800 Randy Dunlap <rdunlap@xenotime.net> wrote:
> >
> > on i386:
> >
> > kernel/kcmp.c:153:10: error: 'EOPNOTSUP' undeclared (first use in this
> > function)
>
> Caused by commit 0e8a8193207d ("syscalls, x86: add __NR_kcmp syscall")
> from the akpm tree. Missing include of linux/errno.h ...
>
Ouch. Thanks Stephen for catching this and Andrew for fixing. Sorry.
Cyrill
^ permalink raw reply
* Re: [PATCH] mm: add config NUMA stub to all architectures
From: Stephen Rothwell @ 2012-02-17 23:39 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Konstantin Khlebnikov, Andrew Morton, linux-next@vger.kernel.org,
LKML
In-Reply-To: <20120217134404.GA11353@merkur.ravnborg.org>
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
Hi Sam,
On Fri, 17 Feb 2012 14:44:04 +0100 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> > Seems like Kconfig allow config option duplication, but it use default state from first.
> > If we add "config NUMA\n def_bool n" somewhere in generic Kconfig, default will be n if
> > Kconfig see this declaration first.
> Correct.
> And as n is default there is no need to specify it.
> But please add a help text that explain the symbol - even if it is not
> visible in menuconfig.
So does that mean that a simple
config NUMA
bool
help
some help text
in mm/Kconfig will have no effect on the defaults and dependencies if
"config NUMA" is specified elsewhere? (except to add the needed
__enabled_CONFIG_NUMA defines, of course). If that is the case, then
that is what we should add, right?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Feb 17 (kernel/kcmp.c)
From: Stephen Rothwell @ 2012-02-17 23:14 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-next, LKML, Cyrill Gorcunov, Andrew Morton
In-Reply-To: <4F3E95B7.3010700@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
Hi all,
On Fri, 17 Feb 2012 10:00:23 -0800 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> on i386:
>
> kernel/kcmp.c:153:10: error: 'EOPNOTSUP' undeclared (first use in this
> function)
Caused by commit 0e8a8193207d ("syscalls, x86: add __NR_kcmp syscall")
from the akpm tree. Missing include of linux/errno.h ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ 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