From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Fri, 08 Aug 2008 15:03:13 -0700 Message-ID: <200808082203.m78M3Dob031021@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:59231 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764668AbYHHWEE (ORCPT ); Fri, 8 Aug 2008 18:04:04 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id m78M3Dso032765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 8 Aug 2008 15:03:14 -0700 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: akpm@linux-foundation.org The patch titled linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- arch/sparc64/kernel/sys_sparc32.c | 3 --- drivers/watchdog/at91rm9200_wdt.c | 5 ----- drivers/watchdog/davinci_wdt.c | 4 ---- drivers/watchdog/ep93xx_wdt.c | 4 ---- drivers/watchdog/ixp2000_wdt.c | 4 ---- drivers/watchdog/ixp4xx_wdt.c | 4 ---- drivers/watchdog/ks8695_wdt.c | 7 ------- drivers/watchdog/omap_wdt.c | 7 ------- drivers/watchdog/pnx4008_wdt.c | 4 ---- drivers/watchdog/sa1100_wdt.c | 4 ---- drivers/watchdog/wdt285.c | 4 ---- 11 files changed, 50 deletions(-) diff -puN arch/sparc64/kernel/sys_sparc32.c~linux-next-git-rejects arch/sparc64/kernel/sys_sparc32.c --- a/arch/sparc64/kernel/sys_sparc32.c~linux-next-git-rejects +++ a/arch/sparc64/kernel/sys_sparc32.c @@ -58,8 +58,6 @@ #include #include -<<<<<<< HEAD:arch/sparc64/kernel/sys_sparc32.c -======= asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group) { return sys_chown(filename, low2highuid(user), low2highgid(group)); @@ -236,7 +234,6 @@ asmlinkage long sys32_getegid16(void) return high2lowgid(current->cred->egid); } ->>>>>>> FETCH_HEAD:arch/sparc64/kernel/sys_sparc32.c /* 32-bit timeval and related flotsam. */ static inline long put_tv32(struct compat_timeval __user *o, struct timeval *i) diff -puN drivers/watchdog/at91rm9200_wdt.c~linux-next-git-rejects drivers/watchdog/at91rm9200_wdt.c --- a/drivers/watchdog/at91rm9200_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/at91rm9200_wdt.c @@ -20,13 +20,8 @@ #include #include #include -<<<<<<< HEAD:drivers/watchdog/at91rm9200_wdt.c #include -#include -======= -#include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/at91rm9200_wdt.c #define WDT_DEFAULT_TIME 5 /* seconds */ diff -puN drivers/watchdog/davinci_wdt.c~linux-next-git-rejects drivers/watchdog/davinci_wdt.c --- a/drivers/watchdog/davinci_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/davinci_wdt.c @@ -25,13 +25,9 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/davinci_wdt.c -#include -======= #include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/davinci_wdt.c #define MODULE_NAME "DAVINCI-WDT: " diff -puN drivers/watchdog/ep93xx_wdt.c~linux-next-git-rejects drivers/watchdog/ep93xx_wdt.c --- a/drivers/watchdog/ep93xx_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/ep93xx_wdt.c @@ -30,12 +30,8 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/ep93xx_wdt.c -#include -======= #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/ep93xx_wdt.c #define WDT_VERSION "0.3" #define PFX "ep93xx_wdt: " diff -puN drivers/watchdog/ixp2000_wdt.c~linux-next-git-rejects drivers/watchdog/ixp2000_wdt.c --- a/drivers/watchdog/ixp2000_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/ixp2000_wdt.c @@ -27,12 +27,8 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/ixp2000_wdt.c -#include -======= #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/ixp2000_wdt.c static int nowayout = WATCHDOG_NOWAYOUT; static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ diff -puN drivers/watchdog/ixp4xx_wdt.c~linux-next-git-rejects drivers/watchdog/ixp4xx_wdt.c --- a/drivers/watchdog/ixp4xx_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/ixp4xx_wdt.c @@ -24,12 +24,8 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/ixp4xx_wdt.c -#include -======= #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/ixp4xx_wdt.c static int nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = 60; /* (secs) Default is 1 minute */ diff -puN drivers/watchdog/ks8695_wdt.c~linux-next-git-rejects drivers/watchdog/ks8695_wdt.c --- a/drivers/watchdog/ks8695_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/ks8695_wdt.c @@ -19,16 +19,9 @@ #include #include #include -<<<<<<< HEAD:drivers/watchdog/ks8695_wdt.c #include -#include -#include -======= -#include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/ks8695_wdt.c - #define WDT_DEFAULT_TIME 5 /* seconds */ #define WDT_MAX_TIME 171 /* seconds */ diff -puN drivers/watchdog/omap_wdt.c~linux-next-git-rejects drivers/watchdog/omap_wdt.c --- a/drivers/watchdog/omap_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/omap_wdt.c @@ -40,16 +40,9 @@ #include #include #include -<<<<<<< HEAD:drivers/watchdog/omap_wdt.c #include -#include -#include -======= - -#include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/omap_wdt.c #include diff -puN drivers/watchdog/pnx4008_wdt.c~linux-next-git-rejects drivers/watchdog/pnx4008_wdt.c --- a/drivers/watchdog/pnx4008_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/pnx4008_wdt.c @@ -31,13 +31,9 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/pnx4008_wdt.c -#include -======= #include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/pnx4008_wdt.c #define MODULE_NAME "PNX4008-WDT: " diff -puN drivers/watchdog/sa1100_wdt.c~linux-next-git-rejects drivers/watchdog/sa1100_wdt.c --- a/drivers/watchdog/sa1100_wdt.c~linux-next-git-rejects +++ a/drivers/watchdog/sa1100_wdt.c @@ -32,13 +32,9 @@ #include #endif -<<<<<<< HEAD:drivers/watchdog/sa1100_wdt.c -#include -======= #include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/sa1100_wdt.c #define OSCR_FREQ CLOCK_TICK_RATE diff -puN drivers/watchdog/wdt285.c~linux-next-git-rejects drivers/watchdog/wdt285.c --- a/drivers/watchdog/wdt285.c~linux-next-git-rejects +++ a/drivers/watchdog/wdt285.c @@ -29,13 +29,9 @@ #include #include -<<<<<<< HEAD:drivers/watchdog/wdt285.c -#include -======= #include #include #include ->>>>>>> FETCH_HEAD:drivers/watchdog/wdt285.c #include #include _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch printk-robustify-printk-fix.patch seq_file-fix-bug-when-seq_read-reads-nothing.patch linux-next.patch next-remove-localversion.patch linux-next-git-rejects.patch arch-x86-pci-irqc-attempt-to-clean-up-code-layout.patch zero-based-percpu-use-vmlinux_symbol-in-include-asm-generic-vmlinuxldsh.patch git-agpgart.patch git-agpgart.patch ppc-use-the-common-ascii-hex-helpers.patch powerpc-replace-__function__-with-__func__.patch git-drm.patch i2c-renesas-highlander-fpga-smbus-support-update-fix.patch git-dlm.patch tick-schedc-suppress-needless-timer-reprogramming.patch drivers-input-serio-xilinx_ps2c-fix-warning.patch git-jg-misc.patch git-kvm.patch git-mtd.patch git-ubi-git-rejects.patch sundance-set-carrier-status-on-link-change-events.patch cassini-use-request_firmware.patch e1000e-remove-inapplicable-test-for-ioport-checkpatch-fixes.patch git-nfsd.patch git-pci-current.patch sched-type-fix.patch lockdep-spin_lock_nest_lock-fix-checkpatch-fixes.patch scsi-gdthc-use-unaligned-access-helpers.patch git-unionfs.patch git-logfs-git-rejects.patch git-logfs-fixup.patch drivers-usb-class-cdc-acmc-use-correct-type-for-cpu-flags.patch drivers-usb-class-cdc-wdmc-fix-build-with-config_pm=n.patch git-xtensa.patch git-pekka.patch scsi-dpt_i2o-is-bust-on-ia64.patch hwmon-adc124s501-generic-driver.patch drivers-net-netxen-netxen_nic_hwc-fix-printk-warnings.patch rcu-fix-synchronize_rcu-so-that-kernel-doc-works.patch ftrace-disable-function-tracing-bringing-up-new-cpu.patch scsi-megaraid_sas-add-the-new-controllers-support-checkpatch-fixes.patch unrevert-usb-dont-explicitly-reenable-root-hub-status-interrupts.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch vmscan-move-isolate_lru_page-to-vmscanc.patch define-page_file_cache-function.patch vmscan-split-lru-lists-into-anon-file-sets.patch unevictable-lru-infrastructure.patch unevictable-lru-page-statistics.patch mlock-mlocked-pages-are-unevictable.patch mmap-handle-mlocked-pages-during-map-remap-unmap.patch vmscan-unevictable-lru-scan-sysctl.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch h8300-generic_bug-support-checkpatch-fixes.patch autofs4-track-uid-and-gid-of-last-mount-requester-fix.patch autofs4-add-miscellaneous-device-for-ioctls-fix.patch fb-push-down-the-bkl-in-the-ioctl-handler-checkpatch-fixes.patch eink_apollofb-new-driver-for-apollo-eink-controller.patch devpts-switch-to-ida-checkpatch-fixes.patch gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch