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: Tue, 24 Jan 2012 14:19:57 -0800 Message-ID: <20120124221957.81A851E13FF@wpzn4.hot.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-yw0-f74.google.com ([209.85.213.74]:43118 "EHLO mail-yw0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767Ab2AXWT6 (ORCPT ); Tue, 24 Jan 2012 17:19:58 -0500 Received: by yhjj52 with SMTP id j52so473788yhj.1 for ; Tue, 24 Jan 2012 14:19:57 -0800 (PST) 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 Subject: 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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- sound/pci/hda/hda_intel.c | 6 ------ 1 file changed, 6 deletions(-) diff -puN sound/pci/hda/hda_intel.c~linux-next-git-rejects sound/pci/hda/hda_intel.c --- a/sound/pci/hda/hda_intel.c~linux-next-git-rejects +++ a/sound/pci/hda/hda_intel.c @@ -2776,11 +2776,6 @@ static int __devinit azx_create(struct s } /* disable buffer size rounding to 128-byte multiples if supported */ -<<<<<<< HEAD - chip->align_buffer_size = align_buffer_size; - if (chip->driver_caps & AZX_DCAPS_BUFSIZE) - chip->align_buffer_size = 0; -======= if (align_buffer_size >= 0) chip->align_buffer_size = !!align_buffer_size; else { @@ -2791,7 +2786,6 @@ static int __devinit azx_create(struct s else chip->align_buffer_size = 1; } ->>>>>>> linux-next/akpm-end /* allow 64bit DMA address if supported by H/W */ if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64))) _ Subject: Subject: linux-next-git-rejects Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs.patch drivers-platform-x86-sony-laptopc-fix-scancodes.patch fs-btrfs-inode-mapc-fix-warnings.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix.patch drivers-scsi-mpt2sas-mpt2sas_scsihc-spell-primitive-correctly.patch drivers-usb-misc-emi26c-emi62c-fix-warnings.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix.patch prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix.patch prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix-fix.patch brlocks-lglocks-cleanups-checkpatch-fixes.patch crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch