linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for November 12
@ 2010-11-12  2:05 Stephen Rothwell
  2010-11-13 16:44 ` [PATCH -next] edac: use BIT_64() to eliminate warnings Randy Dunlap
                   ` (5 more replies)
  0 siblings, 6 replies; 13+ messages in thread
From: Stephen Rothwell @ 2010-11-12  2:05 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20101111:

The voltage tree lost its build failure.

The fsnotify tree lost its build failure.

The tty tree gained a build failure for which I reverted a commit.

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

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 179 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
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master d0e885e] Revert "ifx6x60: SPI protocol driver for Infineon 6x60 modem"

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

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

* [PATCH -next] edac: use BIT_64() to eliminate warnings
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-14 17:54   ` Borislav Petkov
  2010-11-13 16:44 ` [PATCH -next] iwlwifi: fix modular legacy build errors Randy Dunlap
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, akpm
  Cc: linux-next, LKML, Doug Thompson, Borislav Petkov, bluesmoke-devel

From: Randy Dunlap <randy.dunlap@oracle.com>

Building for X86_32 produces shift count warnings, so use
BIT_64() to eliminate the warnings.

drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
drivers/edac/mce_amd.c:778: warning: left shift count >= width of type

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: bluesmoke-devel@lists.sourceforge.net
---
 drivers/edac/mce_amd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-next-20101112.orig/drivers/edac/mce_amd.c
+++ linux-next-20101112/drivers/edac/mce_amd.c
@@ -776,8 +776,8 @@ int amd_decode_mce(struct notifier_block
 
 	if (c->x86 == 0x15)
 		pr_cont("|%s|%s",
-			((m->status & BIT(44))	? "Deferred" : "-"),
-			((m->status & BIT(43))	? "Poison"   : "-"));
+			((m->status & BIT_64(44)) ? "Deferred" : "-"),
+			((m->status & BIT_64(43)) ? "Poison"   : "-"));
 
 	/* do the two bits[14:13] together */
 	ecc = (m->status >> 45) & 0x3;

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

* [PATCH -next] iwlwifi: fix modular legacy build errors
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
  2010-11-13 16:44 ` [PATCH -next] edac: use BIT_64() to eliminate warnings Randy Dunlap
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-13 16:44 ` [PATCH -next] pci-sysfs: fix printk warnings Randy Dunlap
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, linux-wireless, akpm
  Cc: linux-next, LKML, linville, einette Chatre, Wey-Yi Guy

From: Randy Dunlap <randy.dunlap@oracle.com>

With CONFIG_IWLWIFI=m, CONFIG_IWLAGN=m, and CONFIG_IWL3945=m,
a kernel build has errors as below.  Changing a few lines in the
Makefile is one possible fix for these build errors.

ERROR: "iwl_legacy_mac_config" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_isr_legacy" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_tx_cmd_protection" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_bss_info_changed" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!
ERROR: "iwl_legacy_mac_reset_tsf" [drivers/net/wireless/iwlwifi/iwl3945.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc:	Reinette Chatre <reinette.chatre@intel.com>
Cc:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
 drivers/net/wireless/iwlwifi/Makefile |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- linux-next-20101112.orig/drivers/net/wireless/iwlwifi/Makefile
+++ linux-next-20101112/drivers/net/wireless/iwlwifi/Makefile
@@ -2,8 +2,6 @@ obj-$(CONFIG_IWLWIFI)	+= iwlcore.o
 iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
 iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o
 iwlcore-objs 		+= iwl-scan.o iwl-led.o
-iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o
-iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 
@@ -17,7 +15,7 @@ iwlagn-objs		+= iwl-agn-lib.o iwl-agn-rx
 iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o
 iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o
 
-iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
+iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwl-legacy.o
 iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o
 iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
 iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
@@ -25,7 +23,7 @@ iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
 
 # 3945
 obj-$(CONFIG_IWL3945)	+= iwl3945.o
-iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o
+iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o iwl-legacy.o
 iwl3945-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-3945-debugfs.o
 
 ccflags-y += -D__CHECK_ENDIAN__

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

* [PATCH -next] pci-sysfs: fix printk warnings
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
  2010-11-13 16:44 ` [PATCH -next] edac: use BIT_64() to eliminate warnings Randy Dunlap
  2010-11-13 16:44 ` [PATCH -next] iwlwifi: fix modular legacy build errors Randy Dunlap
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-13 16:44 ` [PATCH -next] staging: fix iio/gyro typos, build errors Randy Dunlap
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, linux-pci, akpm; +Cc: linux-next, LKML, Jesse Barnes

From: Randy Dunlap <randy.dunlap@oracle.com>

Cast pci_resource_start() and pci_resource_len() to u64 for printk.

drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 9 has type 'resource_size_t'
drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 10 has type 'resource_size_t'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/pci/pci-sysfs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-next-20101112.orig/drivers/pci/pci-sysfs.c
+++ linux-next-20101112/drivers/pci/pci-sysfs.c
@@ -754,7 +754,8 @@ pci_mmap_resource(struct kobject *kobj, 
 			"at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n",
 			current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff,
 			pci_name(pdev), i,
-			pci_resource_start(pdev, i), pci_resource_len(pdev, i));
+			(u64)pci_resource_start(pdev, i),
+			(u64)pci_resource_len(pdev, i));
 		return -EINVAL;
 	}
 

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

* [PATCH -next] staging: fix iio/gyro typos, build errors
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
                   ` (2 preceding siblings ...)
  2010-11-13 16:44 ` [PATCH -next] pci-sysfs: fix printk warnings Randy Dunlap
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-13 16:44 ` [PATCH -next] x86/mrst: force support code to be built Randy Dunlap
  2010-11-13 16:44 ` [PATCH -next] xen: fix header export to userspace Randy Dunlap
  5 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, gregkh, driverdevel; +Cc: linux-next, LKML, akpm

From: Randy Dunlap <randy.dunlap@oracle.com>

Typo causes build errors.  Did anyone even build this driver?

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/staging/iio/gyro/adis16251.h |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Also has section mismatch warnings:

WARNING: drivers/staging/built-in.o(.data+0xe9b8): Section mismatch in reference from the variable spi_adis16255_drv to the function .devinit.text:spi_adis16255_probe()
The variable spi_adis16255_drv references
the function __devinit spi_adis16255_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, 

WARNING: drivers/staging/built-in.o(.data+0xe9c0): Section mismatch in reference from the variable spi_adis16255_drv to the function .devexit.text:spi_adis16255_remove()
The variable spi_adis16255_drv references
the function __devexit spi_adis16255_remove()
If the reference is valid then annotate the
variable with __exit* (see linux/init.h) or name the variable:
*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,


--- linux-next-20101112.orig/drivers/staging/iio/gyro/adis16251.h
+++ linux-next-20101112/drivers/staging/iio/gyro/adis16251.h
@@ -56,14 +56,14 @@
 #define ADIS16251_DIAG_STAT_POWER_HIGH	(1<<1)
 #define ADIS16251_DIAG_STAT_POWER_LOW	(1<<0)
 
-#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16261_DIAG_STAT_ALARM2 | \
-				      ADIS16261_DIAG_STAT_ALARM1 | \
-				      ADIS16261_DIAG_STAT_SELF_TEST | \
-				      ADIS16261_DIAG_STAT_OVERFLOW | \
-				      ADIS16261_DIAG_STAT_SPI_FAIL | \
-				      ADIS16261_DIAG_STAT_FLASH_UPT | \
-				      ADIS16261_DIAG_STAT_POWER_HIGH | \
-				      ADIS16261_DIAG_STAT_POWER_LOW)
+#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16251_DIAG_STAT_ALARM2 | \
+				      ADIS16251_DIAG_STAT_ALARM1 | \
+				      ADIS16251_DIAG_STAT_SELF_TEST | \
+				      ADIS16251_DIAG_STAT_OVERFLOW | \
+				      ADIS16251_DIAG_STAT_SPI_FAIL | \
+				      ADIS16251_DIAG_STAT_FLASH_UPT | \
+				      ADIS16251_DIAG_STAT_POWER_HIGH | \
+				      ADIS16251_DIAG_STAT_POWER_LOW)
 
 /* GLOB_CMD */
 #define ADIS16251_GLOB_CMD_SW_RESET	(1<<7)

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

* [PATCH -next] x86/mrst: force support code to be built
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
                   ` (3 preceding siblings ...)
  2010-11-13 16:44 ` [PATCH -next] staging: fix iio/gyro typos, build errors Randy Dunlap
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-15 13:43   ` Alan Cox
  2010-11-13 16:44 ` [PATCH -next] xen: fix header export to userspace Randy Dunlap
  5 siblings, 1 reply; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, akpm; +Cc: linux-next, LKML, x86

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix mrst.c build: make sure that its called functions are built.

arch/x86/built-in.o: In function `mrst_reboot':
mrst.c:(.text+0x2250b): undefined reference to `intel_scu_ipc_simple_command'
arch/x86/built-in.o: In function `mrst_power_off':
mrst.c:(.text+0x2252e): undefined reference to `intel_scu_ipc_simple_command'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/x86/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20101112.orig/arch/x86/Kconfig
+++ linux-next-20101112/arch/x86/Kconfig
@@ -387,6 +387,7 @@ config X86_MRST
 	select APB_TIMER
 	select I2C
 	select SPI
+	select X86_PLATFORM_DEVICES
 	---help---
 	  Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
 	  Internet Device(MID) platform. Moorestown consists of two chips:

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

* [PATCH -next] xen: fix header export to userspace
  2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
                   ` (4 preceding siblings ...)
  2010-11-13 16:44 ` [PATCH -next] x86/mrst: force support code to be built Randy Dunlap
@ 2010-11-13 16:44 ` Randy Dunlap
  2010-11-15 10:23   ` Tony Finch
  2010-11-15 18:15   ` Jeremy Fitzhardinge
  5 siblings, 2 replies; 13+ messages in thread
From: Randy Dunlap @ 2010-11-13 16:44 UTC (permalink / raw)
  To: Stephen Rothwell, akpm
  Cc: linux-next, LKML, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
	xen-devel, virtualization, Tony Finch

From: Randy Dunlap <randy.dunlap@oracle.com>

scripts/headers_install.pl prevents "__user" from being exported
to userspace headers, so just use compiler.h to make sure that
__user is defined and avoid the error.

unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc:	xen-devel@lists.xensource.com (moderated for non-subscribers)
Cc:	virtualization@lists.osdl.org
Cc:	Tony Finch <dot@dotat.at>
---
 include/xen/privcmd.h |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- linux-next-20101112.orig/include/xen/privcmd.h
+++ linux-next-20101112/include/xen/privcmd.h
@@ -34,13 +34,10 @@
 #define __LINUX_PUBLIC_PRIVCMD_H__
 
 #include <linux/types.h>
+#include <linux/compiler.h>
 
 typedef unsigned long xen_pfn_t;
 
-#ifndef __user
-#define __user
-#endif
-
 struct privcmd_hypercall {
 	__u64 op;
 	__u64 arg[5];

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

* Re: [PATCH -next] edac: use BIT_64() to eliminate warnings
  2010-11-13 16:44 ` [PATCH -next] edac: use BIT_64() to eliminate warnings Randy Dunlap
@ 2010-11-14 17:54   ` Borislav Petkov
  0 siblings, 0 replies; 13+ messages in thread
From: Borislav Petkov @ 2010-11-14 17:54 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, akpm, linux-next, LKML, Doug Thompson,
	bluesmoke-devel, edac-devel

On Sat, Nov 13, 2010 at 11:44:26AM -0500, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Building for X86_32 produces shift count warnings, so use
> BIT_64() to eliminate the warnings.
> 
> drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
> drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Doug Thompson <dougthompson@xmission.com>
> Cc: Borislav Petkov <borislav.petkov@amd.com>
> Cc: bluesmoke-devel@lists.sourceforge.net

Thanks, applied.

BTW, Doug, we still carry the bluesmoke-devel ML as edac mailing list
in MAINTAINERS althouth there's a new linux-edac@vger... which got
proposed recently. I think we should use that new one and deprecate the
sourceforge list since the new one is not moderated for subsribers and
thus more open.

Thoughts?

-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

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

* Re: [PATCH -next] xen: fix header export to userspace
  2010-11-13 16:44 ` [PATCH -next] xen: fix header export to userspace Randy Dunlap
@ 2010-11-15 10:23   ` Tony Finch
  2010-11-15 18:15   ` Jeremy Fitzhardinge
  1 sibling, 0 replies; 13+ messages in thread
From: Tony Finch @ 2010-11-15 10:23 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, akpm, linux-next, LKML, Jeremy Fitzhardinge,
	Konrad Rzeszutek Wilk, xen-devel, virtualization

On Sat, 13 Nov 2010, Randy Dunlap wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> scripts/headers_install.pl prevents "__user" from being exported
> to userspace headers, so just use compiler.h to make sure that
> __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)

I suggest the following slightly more informative message

> scripts/headers_install.pl strips "__user" when exporting headers to
> userspace and can introduce a syntax error (detected by unifdef) if
> "__user" appears in an unexpected place. Simplify by using compiler.h to
> make sure that __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)

In any case,

Acked-By:	Tony Finch <dot@dotat.at>

Tony.
-- 
f.anthony.n.finch  <dot@dotat.at>  http://dotat.at/
HUMBER THAMES DOVER WIGHT PORTLAND: NORTH BACKING WEST OR NORTHWEST, 5 TO 7,
DECREASING 4 OR 5, OCCASIONALLY 6 LATER IN HUMBER AND THAMES. MODERATE OR
ROUGH. RAIN THEN FAIR. GOOD.

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

* Re: [PATCH -next] x86/mrst: force support code to be built
  2010-11-13 16:44 ` [PATCH -next] x86/mrst: force support code to be built Randy Dunlap
@ 2010-11-15 13:43   ` Alan Cox
  0 siblings, 0 replies; 13+ messages in thread
From: Alan Cox @ 2010-11-15 13:43 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Stephen Rothwell, akpm, linux-next, LKML, x86

On Sat, 13 Nov 2010 08:44:37 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix mrst.c build: make sure that its called functions are built.
> 
> arch/x86/built-in.o: In function `mrst_reboot':
> mrst.c:(.text+0x2250b): undefined reference to `intel_scu_ipc_simple_command'
> arch/x86/built-in.o: In function `mrst_power_off':
> mrst.c:(.text+0x2252e): undefined reference to `intel_scu_ipc_simple_command'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  arch/x86/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20101112.orig/arch/x86/Kconfig
> +++ linux-next-20101112/arch/x86/Kconfig
> @@ -387,6 +387,7 @@ config X86_MRST
>  	select APB_TIMER
>  	select I2C
>  	select SPI
> +	select X86_PLATFORM_DEVICES

We need the SCU so in fact we really want to select that. I'll send a
patch to Ingo.

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

* Re: [PATCH -next] xen: fix header export to userspace
  2010-11-13 16:44 ` [PATCH -next] xen: fix header export to userspace Randy Dunlap
  2010-11-15 10:23   ` Tony Finch
@ 2010-11-15 18:15   ` Jeremy Fitzhardinge
  1 sibling, 0 replies; 13+ messages in thread
From: Jeremy Fitzhardinge @ 2010-11-15 18:15 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, akpm, linux-next, LKML, Konrad Rzeszutek Wilk,
	xen-devel, virtualization, Tony Finch

On 11/13/2010 08:44 AM, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> scripts/headers_install.pl prevents "__user" from being exported
> to userspace headers, so just use compiler.h to make sure that
> __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature EOF (#if line 33 depth 1)

Ah, OK, thanks.  I was wondering what the proper fix for this was.  I'll
stick this in my tree.

Thanks,
    J

> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
> Cc:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc:	xen-devel@lists.xensource.com (moderated for non-subscribers)
> Cc:	virtualization@lists.osdl.org
> Cc:	Tony Finch <dot@dotat.at>
> ---
>  include/xen/privcmd.h |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> --- linux-next-20101112.orig/include/xen/privcmd.h
> +++ linux-next-20101112/include/xen/privcmd.h
> @@ -34,13 +34,10 @@
>  #define __LINUX_PUBLIC_PRIVCMD_H__
>  
>  #include <linux/types.h>
> +#include <linux/compiler.h>
>  
>  typedef unsigned long xen_pfn_t;
>  
> -#ifndef __user
> -#define __user
> -#endif
> -
>  struct privcmd_hypercall {
>  	__u64 op;
>  	__u64 arg[5];


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

* linux-next: Tree for November 12
@ 2009-11-12  8:51 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2009-11-12  8:51 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20091111:

Linus' tree gained a build failure for which I applied a patch.

The net tree lost 3 conflicts.

The cpufreq tree gained a conflict against the acpi tree.

The rr tree lost its build failure but exposed build failures in the
powerpc and sparc trees for which I applied patches.  It also had another
build failure due to an interaction with the kbuild tree for which I
applied another patch.

The i7core_edac tree gained a build failure for which I have applied a
patch.

The tip tree lost its build failure.

The sysctl tree gained a build failure for which I applied a patch.

The usb tree lost its conflicts.

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

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 148 trees (counting Linus' and 22 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Applying: jbd: export log_start_commit for ext3
Merging arm/devel
Merging davinci/davinci-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/common/tuners/tda18271-fe.c
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kvm/timing.h
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig
$ git rm -f drivers/net/sfc/sfe4001.c
Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in include/acpi/processor.h
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ray_cs.c
CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in Documentation/dontdiff
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Applying: i7core_edac: do not export static functions
Merging devicetree/next-devicetree
Merging limits/writable_limits
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c
CONFLICT (content): Merge conflict in kernel/irq/chip.c
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hvCall.S
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in kernel/softlockup.c
CONFLICT (content): Merge conflict in mm/percpu.c
Applying: percpu: merge fixup for variable renaming
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c
Merging scsi-post-merge/master
Applying: modpost: autoconf.h has moved to include/generated
Applying: sysctl: fix build dependency on CONFIG_NET
Applying: powerpc: do not export pci_alloc/free_consistent
Applying: sparc64: don't export static inline pci_ functions

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

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

* linux-next: Tree for November 12
@ 2008-11-12  7:28 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2008-11-12  7:28 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20081111:

New tree:
	fatfs

Undropped tree:
	crypto

Dropped trees (temporarily):
	security-testing (build failure)
	creds (non-trivial conflict)
	userns (it depends on creds)
	semaphore-removal (due to unfixed conflicts against Linus' tree)
	firmware (unfixed build failure)

The net tree gained a conflict against Linus' tree.

The security-testing tree gained a build error and was dropped.

The creds tree gained a conflict against the ttydev tree and another
against Linus' tree so it was dropped.

The cputime tree lost its conflict.

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

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

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 125 trees (counting Linus' and 14 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-realview/clock.c
CONFLICT (content): Merge conflict in arch/arm/mach-versatile/clock.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging quilt/m68k
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/net/usb/hso.c
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/message/fusion/mptlan.c
CONFLICT (content): Merge conflict in drivers/net/sfc/ethtool.c
CONFLICT (content): Merge conflict in net/mac80211/debugfs_sta.c
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree.
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c Documentation/DocBook/wanbook.tmpl
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
$ git reset --hard HEAD^
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
Merging scsi-post-merge/master
Merging fatfs/master

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

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

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

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-12  2:05 linux-next: Tree for November 12 Stephen Rothwell
2010-11-13 16:44 ` [PATCH -next] edac: use BIT_64() to eliminate warnings Randy Dunlap
2010-11-14 17:54   ` Borislav Petkov
2010-11-13 16:44 ` [PATCH -next] iwlwifi: fix modular legacy build errors Randy Dunlap
2010-11-13 16:44 ` [PATCH -next] pci-sysfs: fix printk warnings Randy Dunlap
2010-11-13 16:44 ` [PATCH -next] staging: fix iio/gyro typos, build errors Randy Dunlap
2010-11-13 16:44 ` [PATCH -next] x86/mrst: force support code to be built Randy Dunlap
2010-11-15 13:43   ` Alan Cox
2010-11-13 16:44 ` [PATCH -next] xen: fix header export to userspace Randy Dunlap
2010-11-15 10:23   ` Tony Finch
2010-11-15 18:15   ` Jeremy Fitzhardinge
  -- strict thread matches above, loose matches on Subject: below --
2009-11-12  8:51 linux-next: Tree for November 12 Stephen Rothwell
2008-11-12  7:28 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).