The patch titled
git-mips-git-rejects
has been added to the -mm tree. Its filename is
git-mips-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: git-mips-git-rejects
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Probably wrong...
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/au1000/common/dbg_io.c | 3 ---
arch/mips/kernel/Makefile | 6 ------
arch/mips/kernel/traps.c | 13 -------------
arch/mips/mm/c-r4k.c | 6 ------
4 files changed, 28 deletions(-)
diff -puN arch/mips/kernel/Makefile~git-mips-git-rejects arch/mips/kernel/Makefile
--- a/arch/mips/kernel/Makefile~git-mips-git-rejects
+++ a/arch/mips/kernel/Makefile
@@ -4,15 +4,9 @@
extra-y := head.o init_task.o vmlinux.lds
-<<<<<<< HEAD:arch/mips/kernel/Makefile
-obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
- ptrace.o reset.o setup.o signal.o syscall.o \
- time.o topology.o traps.o unaligned.o
-=======
obj-y += cpu-probe.o branch.o entry.o genex.o irq.o irq-gic.o \
process.o ptrace.o reset.o semaphore.o setup.o signal.o \
syscall.o time.o topology.o traps.o unaligned.o
->>>>>>> FETCH_HEAD:arch/mips/kernel/Makefile
obj-$(CONFIG_CEVT_BCM1480) += cevt-bcm1480.o
obj-$(CONFIG_CEVT_R4K) += cevt-r4k.o
diff -puN arch/mips/au1000/common/dbg_io.c~git-mips-git-rejects arch/mips/au1000/common/dbg_io.c
--- a/arch/mips/au1000/common/dbg_io.c~git-mips-git-rejects
+++ a/arch/mips/au1000/common/dbg_io.c
@@ -54,10 +54,7 @@ typedef unsigned int uint32;
#define UART16550_READ(y) (au_readl(DEBUG_BASE + y) & 0xff)
#define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y))
-<<<<<<< HEAD:arch/mips/au1000/common/dbg_io.c
-=======
extern unsigned long get_au1x00_uart_baud_base(void);
->>>>>>> FETCH_HEAD:arch/mips/au1000/common/dbg_io.c
extern unsigned long calc_clock(void);
void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
diff -puN arch/mips/kernel/traps.c~git-mips-git-rejects arch/mips/kernel/traps.c
--- a/arch/mips/kernel/traps.c~git-mips-git-rejects
+++ a/arch/mips/kernel/traps.c
@@ -196,21 +196,12 @@ EXPORT_SYMBOL(dump_stack);
static void show_code(unsigned int __user *pc)
{
long i;
-<<<<<<< HEAD:arch/mips/kernel/traps.c
- unsigned short __user *pc16 = NULL;
-
- printk("\nCode:");
-
- if ((unsigned long)pc & 1)
- pc16 = (unsigned short __user *)((unsigned long)pc & ~1);
-=======
unsigned short *pc16 = NULL;
printk("\nCode:");
if ((unsigned int)pc & 1)
pc16 = (unsigned short *)((unsigned int)pc & ~1);
->>>>>>> FETCH_HEAD:arch/mips/kernel/traps.c
for(i = -3 ; i < 6 ; i++) {
unsigned int insn;
if (pc16 ? __get_user(insn, pc16 + i) : __get_user(insn, pc + i)) {
@@ -1389,11 +1380,7 @@ int cp0_compare_irq;
int cp0_perfcount_irq;
EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
-<<<<<<< HEAD:arch/mips/kernel/traps.c
-static int __cpuinitdata noulri;
-=======
static int __initdata noulri;
->>>>>>> FETCH_HEAD:arch/mips/kernel/traps.c
static int __init ulri_disable(char *s)
{
diff -puN arch/mips/mm/c-r4k.c~git-mips-git-rejects arch/mips/mm/c-r4k.c
--- a/arch/mips/mm/c-r4k.c~git-mips-git-rejects
+++ a/arch/mips/mm/c-r4k.c
@@ -1227,11 +1227,8 @@ void au1x00_fixup_config_od(void)
}
static int __cpuinitdata cca = -1;
-<<<<<<< HEAD:arch/mips/mm/c-r4k.c
-=======
unsigned long _page_cachable_default;
EXPORT_SYMBOL_GPL(_page_cachable_default);
->>>>>>> FETCH_HEAD:arch/mips/mm/c-r4k.c
static int __init cca_setup(char *str)
{
@@ -1249,8 +1246,6 @@ static void __cpuinit coherency_setup(vo
_page_cachable_default = cca << _CACHE_SHIFT;
pr_debug("Using cache attribute %d\n", cca);
-<<<<<<< HEAD:arch/mips/mm/c-r4k.c
-=======
protection_map[0] = PAGE_NONE;
protection_map[1] = PAGE_READONLY;
@@ -1269,7 +1264,6 @@ static void __cpuinit coherency_setup(vo
protection_map[14] = PAGE_SHARED;
protection_map[15] = PAGE_SHARED;
->>>>>>> FETCH_HEAD:arch/mips/mm/c-r4k.c
change_c0_config(CONF_CM_CMASK, cca);
/*
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
sxc-fix-printk-warnings-on-sparc32.patch
drivers-scsi-dpt_i2oc-fix-build-on-alpha.patch
quota-dont-call-sync_fs-from-vfs_quota_off-when-theres-no-quota-turn-off-fix.patch
linux-next.patch
revert-9p-convert-from-semaphore-to-spinlock.patch
revert-memory-hotplug-register-section-node-id-to-free.patch
acpi-enable-c3-power-state-on-dell-inspiron-8200.patch
acpi-video-balcklist-fujitsu-lifebook-s6410.patch
git-x86-fixup.patch
x86-geode-cache-results-from-geode_has_vsa2-and-uninline.patch
arm-omap1-n770-convert-audio_pwr_sem-in-a-mutex-fix.patch
cifs-suppress-warning.patch
sysfs-provide-a-clue-about-the-effects-of-config_usb_device_class=y.patch
i2c-renesas-highlander-fpga-smbus-support.patch
dlm-convert-connections_lock-in-a-mutex-fix.patch
git-input.patch
touch-screen-driver-for-the-superh-migor-board.patch
git-jg-misc-git-rejects.patch
git-mips.patch
git-mips-git-rejects.patch
git-mmc.patch
sundance-set-carrier-status-on-link-change-events.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
git-battery.patch
fs-nfs-callback_xdrc-suppress-uninitialiized-variable-warnings.patch
arch-parisc-kernel-unalignedc-use-time_-macros.patch
pci-hotplug-introduce-pci_slot.patch
pci-hotplug-acpi-pci-slot-detection-driver.patch
git-unionfs.patch
git-unionfs-fixup.patch
git-v9fs.patch
git-watchdog.patch
git-watchdog-git-rejects.patch
watchdog-fix-booke_wdtc-on-mpc85xx-smp-system.patch
xfs-suppress-uninitialized-var-warnings.patch
git-xtensa.patch
ext4-is-busted-on-m68k.patch
colibri-fix-support-for-dm9000-ethernet-device-fix.patch
pci-export-resource_wc-in-pci-sysfs-fix.patch
vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch
vm-dont-run-touch_buffer-during-buffercache-lookups.patch
locking-add-typecheck-on-irqsave-and-friends-for-correct-flags-checkpatch-fixes.patch
remove-apparently-unused-fd1772h-header-file.patch
lib-allow-memparse-to-accept-a-null-and-ignorable-second-parm-checkpatch-fixes.patch
drivers-video-aty-radeon_basec-notify-user-if-sysfs_create_bin_file-failed-checkpatch-fixes.patch
documentation-build-source-files-in-documentation-sub-dir-disable.patch
reiser4.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
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
