| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Nick writes:
After all this time, I see this patch still manages to find its way,
occasionally, into the patch queue for older -stable. :)
It should be harmless to apply, but this patch doesn't actually fix
any real problem on kernels previous to 2.6.38 because the AF_ALG
userspace interface does not exist in these kernels.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
One of the drop monitor commits adds an __rcu, and then it is
removed in a subsequent commit. So the full series builds, but
if you are bisecting, it introduces a build failure if you land
on the wrong commit.
The sparse __rcu annotation did not exist until 2.6.37+ kernels.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Has other dependencies....
CC kernel/signal.o
kernel/signal.c: In function 'flush_signal_handlers':
kernel/signal.c:364:9: error: 'struct sigaction' has no member named 'sa_restorer'
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
As suggested by Ben Hutchings <ben@decadent.org.uk> during review.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
See upstream 3b87487ac5008072f138953b07505a7e3493327f
-----------
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri Dec 30 13:24:40 2011 -0800
Revert "clockevents: Set noop handler in clockevents_exchange_device()"
This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.
It results in resume problems for various people. See for example
http://thread.gmane.org/gmane.linux.kernel/1233033
http://thread.gmane.org/gmane.linux.kernel/1233389
http://thread.gmane.org/gmane.linux.kernel/1233159
http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877
and the fedora and ubuntu bug reports
https://bugzilla.redhat.com/show_bug.cgi?id=767248
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569
which got bisected down to the stable version of this commit.
Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Reported-by: Phil Miller <mille121@illinois.edu>
Reported-by: Philip Langdale <philipl@overt.org>
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <gregkh@suse.de>
Cc: stable@kernel.org # for stable kernels that applied the original
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-----------
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
The essence of this commit on mailine was:
if (...) {
...
+ newcode;
...
} else
...
but in 2.6.34, it was:
if (...)
...
else
...
so, unlike the original, we also have to replace the else line
(vs. it just being context) and add in the closing brace.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Pull in the upstream commits made to the 2.6.32.51 release.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
See :
------------
commit 60ad92d2ff7601d8dbdd9262d113d379f20d31f0
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed Aug 15 16:54:38 2012 -0400
md: postpone 2TB/4TB patch until 2.6.34.14
------------
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Pull in the upstream commits made to the 2.6.32.50 release.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
They served their purpose, in getting patches from mainline
to here.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Herton notes:
-----
> commit b52a360b2aa1c59ba9970fb0f52bbb093fcc7a24 upstream.
>
> Fixes a possible memory corruption when the link is larger than
> MAXPATHLEN and XFS_DEBUG is not enabled. This also remove the
> S_ISLNK assert, since the inode mode is checked previously in
> xfs_readlink_by_handle() and via VFS.
>
> Updated to address concerns raised by Ben Hutchings about the loose
> attention paid to 32- vs 64-bit values, and the lack of handling a
> potentially negative pathlen value:
> - Changed type of "pathlen" to be xfs_fsize_t, to match that of
> ip->i_d.di_size
> - Added checking for a negative pathlen to the too-long pathlen
> test, and generalized the message that gets reported in that case
> to reflect the change
> As a result, if a negative pathlen were encountered, this function
> would return EFSCORRUPTED (and would fail an assertion for a debug
> build)--just as would a too-long pathlen.
>
> Signed-off-by: Alex Elder <aelder@sgi.com>
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> [PG: no xfs_alert in 2.6.34; use xfs_fs_cmn_err(CE_ALERT, ...) instead]
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
[...]
commit 9b025eb3a89e041bab6698e3858706be2385d692 ("xfs: Fix missing
xfs_iunlock() on error recovery path in xfs_readlink()") addresses a
regression with this change, something to consider for inclusion too.
-----
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Herton notes:
------
> commit 3321c07ae5068568cd61ac9f4ba749006a7185c9 upstream.
>
> Since the buffer might contain security related data it might be a good idea to
> zero the buffer after we have copied it to userspace.
>
> This got assigned CVE-2011-1162.
>
> Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
> Signed-off-by: James Morris <jmorris@namei.org>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
[...]
commit 3ab1aff89477dafb1aaeafe8c8669114a02b7226 ("TPM: Zero buffer whole
after copying to userspace") is something to consider to be applied
after this, either with this update or later 2.6.34 update. It
complements this change, just fyi.
------
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Herton notes:
------
> commit 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d upstream.
>
> This should have been backported when it was commited, but I
> mistook the problem as requiring the ntp_lock changes
> that landed in 3.4 in order for it to occur.
>
> Unfortunately the same issue can happen (with only one cpu)
> as follows:
> do_adjtimex()
> write_seqlock_irq(&xtime_lock);
> process_adjtimex_modes()
> process_adj_status()
> ntp_start_leap_timer()
> hrtimer_start()
> hrtimer_reprogram()
> tick_program_event()
> clockevents_program_event()
> ktime_get()
> seq = req_seqbegin(xtime_lock); [DEADLOCK]
>
> This deadlock will no always occur, as it requires the
> leap_timer to force a hrtimer_reprogram which only happens
> if its set and there's no sooner timer to expire.
[...]
I remember this came through the leapsecond deadlock & hrtimer/futex
issue fixes. But I noted now commit 6b1859dba01c7d512b72d77e3fd7da8354235189
("ntp: Fix STA_INS/DEL clearing bug") was not included, and its changelog
says it fixes a problem introduced with this. Wouldn't it be worth/right to
also include it in 2.6.34? I didn't test etc., just detected through the
changelog/description but would expect it would be affected too. I also
noted it is missing from 3.2.y and 2.6.32.y stables, and perhaps should be
scheduled for inclusion in their cases too.
------
JohnS also agreed this should be incorporated, and mentioned
a pending -tip commit should be considered once it is mainline.
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Herton notes:
-------
> commit f5252e009d5b87071a919221e4f6624184005368 upstream.
>
> The /proc/vmallocinfo shows information about vmalloc allocations in
> vmlist that is a linklist of vm_struct. It, however, may access pages
> field of vm_struct where a page was not allocated. This results in a null
> pointer access and leads to a kernel panic.
>
> Why this happens: In __vmalloc_node_range() called from vmalloc(), newly
> allocated vm_struct is added to vmlist at __get_vm_area_node() and then,
> some fields of vm_struct such as nr_pages and pages are set at
> __vmalloc_area_node(). In other words, it is added to vmlist before it is
> fully initialized. At the same time, when the /proc/vmallocinfo is read,
> it accesses the pages field of vm_struct according to the nr_pages field
> at show_numa_info(). Thus, a null pointer access happens.
>
> The patch adds the newly allocated vm_struct to the vmlist *after* it is
> fully initialized. So, it can avoid accessing the pages field with
> unallocated page when show_numa_info() is called.
>
> Signed-off-by: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: David Rientjes <rientjes@google.com>
> Cc: Namhyung Kim <namhyung@gmail.com>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> [PG: .34 has VMALLOC_START/END vs. start/end in f5252e009d5]
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
[...]
commit 1368edf0647ac112d8cfa6ce47257dc950c50f5c ("mm: vmalloc: check for
page allocation failure before vmlist insertion") addresses a regression
on this change, something to consider for inclusion in this stable
update as well.
-------
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Herton noted:
-----
> commit b1ffb4c851f185e9051ba837c16d9b84ef688d26 upstream.
>
> Fix for ftdi_set_termios() glitching output
>
> ftdi_set_termios() is constantly setting the baud rate, data bits and parity
> unnecessarily on every call, . When called while characters are being
> transmitted can cause the FTDI chip to corrupt the serial port bit stream
> output by stalling the output half a bit during the output of a character.
> Simple fix by skipping this setting if the baud rate/data bits/parity are
> unchanged.
>
> Signed-off-by: Andrew Worsley <amworsley@gmail.com>
[...]
commit 108e02b12921078a59dcacd048079ece48a4a983 ("USB: ftdi_sio: fix
initial baud rate") says it addresses a regression on this change,
something to consider for inclusion with this update.
-----
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
The label name changed since 2.6.34, causing this fail:
virt/kvm/kvm_main.c: In function ‘kvm_vm_ioctl_create_vcpu’:
virt/kvm/kvm_main.c:1327:3: error: label ‘unlock_vcpu_destroy’ used but not defined
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Neil reports that it fixes one problem but adds another.
http://marc.info/?l=linux-kernel&m=134506426430816&w=2
Postpone it until the 2nd fix is upstream.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
To silence these messages from git am:
25: Applying: sparc: Allow handling signals when stack is corrupted.
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:295: trailing whitespace.
}
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:1064: trailing whitespace.
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:1090: space before tab in indent.
(sizeof(unsigned int) * 32));
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:1093: space before tab in indent.
(sizeof(unsigned int) * 32));
warning: 4 lines add whitespace errors.
36: Applying: net/9p: fix client code to fail more gracefully on protocol error
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:10: trailing whitespace.
if(tag >= c->max_tag)
warning: 1 line adds whitespace errors.
76: Applying: USB: pl2303: add id for SMART device
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:25: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
142: Applying: random: Add support for architectural random hooks
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:15: trailing whitespace.
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:18: trailing whitespace.
warning: 2 lines add whitespace errors.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
compile tested and reviewbot'ted.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
This reverts commit d40ec4e609bd24cfa2a1f2251dfda9dec7df8470.
Ben spotted a regression this would cause. It needs an additional
change to be put upstream before these can be deployed. See:
Message-ID: <1344208574.13142.59.camel@deadeye.wl.decadent.org.uk>
in thread:
"Re: [stable 2.6.32.y, 3.0.y, 3.2.y] eCryptfs: Improve statfs reporting"
Conflicts:
queue/series
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
All fed through reviewbot; not yet build tested.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Use head -n1 so we don't get any strings of random quoted
stuff from the remainder of the long log muddying the waters.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Two issues. 1) dragging back the kfree_rcu conversion was wrong,
since there is no kfree_rcu until 3.0 and newer, and 2) add in
the obvious missing header fix from upstream for fail #2.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Untested at this point, just the basic passes "git am" step.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
34-longterm is too easily confused with 3.4 kernel. Use full
name, and switch back to calling it stable.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
I originally didn't add this since it was clearly reverted in 2.6.32.x
However it was re-added in a subsequent 2.6.32.(x+n) as a v2 patch.
I hadn't got that far into the 32.x audit to see that yet.
The only difference between 32 and 34 was context, as a spinlock
was upgraded to a raw type.
Thanks to Jonathan Nieder <jrnieder@gmail.com> for bringing
it to my attention.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Data from Hugh:
--------
Including this commit worries me a little, because it introduces
the ZERO_PAGE case which we later had to change. Though I did end up
supplying the patch below, it was very much in consultation with Peter
and Linus: I'm no expert on futices, and haven't followed the history
of intervening patches between what you're including above and this one
below (and I don't see an rw arg to get_futex_key() in latest source).
I don't know: I'm not NAKking it, I'm just waving a reddish flag,
and hoping that Peter will remember more, and have something more
constructive to say, than I can think of at this moment.
Hugh
commit e6780f7243eddb133cc20ec37fa69317c218b709
Author: Hugh Dickins <hughd@google.com>
Date: Sat Dec 31 11:44:01 2011 -0800
futex: Fix uninterruptible loop due to gate_area
--------
See full discussion at: https://lkml.org/lkml/2012/5/15/87
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
It searches for my initials, followed by ":" -- what I'll put above
my SOB line. Limited to two lines of text, which covers 99% of 'em.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Check for valid toolchains vs grinding away doing SFA for an hour.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
scripts/buildcommits found this regression; the same problem hit the
2.6.32 stable tree, so make use of the same fix methodology here.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
It was later reverted in v2.6.32.49 (d304a4f5)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
28: Applying: USB: gamin_gps: Fix for data transfer problems in native mode
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:69: trailing whitespace.
} else if (bulk_data ||
warning: 1 line adds whitespace errors.
[...]
68: Applying: pata_cm64x: fix boot crash on parisc
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:26: trailing whitespace.
const struct ata_port_info *ppi[] = {
/home/paul/git/stable/linux-2.6.34.y/.git/rebase-apply/patch:74: trailing whitespace.
warning: 2 lines add whitespace errors.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Make it more consistent with what Greg is currently using.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Parallels those added to 2.6.32.42 -- import by applying,
no compile or runtime testing yet.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
----
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
This commit introduced a bug, so you will need this fix as well:
commit 340a3504fd39dad753ba908fb6f894ee81fc3ae2
Author: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Mon Feb 13 14:42:11 2012 -0800
xhci: Fix encoding for HS bulk/control NAK rate.
----
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
https://lkml.org/lkml/2012/3/14/245
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
See later 2.6.32 commit:
commit 2a96ae707525ef00a85bf374e56f0219c07eac5a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 15 13:12:35 2011 -0700
Revert "iwlagn: Support new 5000 microcode."
This reverts commit 6f63415fc1b690cb50c2ad48ba6e9e6e88e271b4.
It turns out this is not what we want to have happen for the .32 and
.33-longterm kernels as it does not work properly at all.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
To keep git am happy during test runs.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Trivial mod needed due to different vars used where the "< 0" check
was added to a line.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Extracted and applied. Not yet build tested.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
I'd put right in the commit log:
[PG: in 34, virtqueue_disable_cb is vi->rvq->vq_ops->disable_cb]
and then didn't change both instances. Duh.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
The above 2 patches in the series file cause a compile failure.
Maybe on the 32 baseline it still works but not on 34. Add the
patch to give of_machine_is_compatible from upstream.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
There was a delete ancient/unused DMA API commit in the 32 selections
that didn't apply cleanly, and since I didn't see the point of it, I
didn't labour over it for the time being and instead skipped it.
Note that some of the .40 selections were added previously.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Dumping a tag list through tail -n1 breaks on the transition
from .9 to .10 - code it properly so it doesn't break.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
In the 34 codebase, there was an extra arg to nilfs_set_file_dirty
that contained the SB. Without it, you get this:
CC fs/nilfs2/file.o
fs/nilfs2/file.c: In function 'nilfs_page_mkwrite':
fs/nilfs2/file.c:110: warning: passing argument 1 of 'nilfs_set_file_dirty' from incompatible pointer type
fs/nilfs2/nilfs.h:253: note: expected 'struct nilfs_sb_info *' but argument is of type 'struct inode *'
fs/nilfs2/file.c:110: warning: passing argument 2 of 'nilfs_set_file_dirty' makes pointer from integer without a cast
fs/nilfs2/nilfs.h:253: note: expected 'struct inode *' but argument is of type 'int'
fs/nilfs2/file.c:110: error: too few arguments to function 'nilfs_set_file_dirty'
make[2]: *** [fs/nilfs2/file.o] Error 1
make[1]: *** [fs/nilfs2/file.o] Error 2
make: *** [sub-make] Error 2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Largely a raw import. Ran reviewbot to look for glaring errors.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
linux-2.6$git tag --contains c4d0c3b097f7584772316ee4d64a09fe0e4ddfca
v2.6.39
v2.6.39-rc1
...
linux-2.6$git tag --contains 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba
v2.6.38
v2.6.38-rc7
...
linux-2.6.34.y$git show c4d0c3b097f7584772316ee4d64a09fe0e4ddfca > a
linux-2.6.34.y$git show 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba > b
linux-2.6.34.y$diff -u a b
--- a 2011-06-28 14:23:36.549804803 -0400
+++ b 2011-06-28 14:23:44.649431589 -0400
@@ -1,4 +1,4 @@
-commit c4d0c3b097f7584772316ee4d64a09fe0e4ddfca
+commit 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba
Author: Dan Rosenberg <drosenberg@vsecurity.com>
Date: Mon Feb 14 13:45:28 2011 +0000
linux-2.6.34.y$
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
As seen on stable mailing list 06/24/2011:
> ---
> > arch/x86/oprofile/op_model_amd.c | 24 ++++++++++++++++--------
> > 1 files changed, 16 insertions(+), 8 deletions(-)
This patch introduces a sleeping-while-atomic bug. There is another
upstream fix on top, see:
commit 3d2606f42984613d324ad3047cf503bcddc3880a
Author: Robert Richter <robert.richter@amd.com>
Date: Fri May 20 09:46:54 2011 +0200
oprofile, x86: Enable preemption during pci device setup in IBS init
This fix should be applied too (or instead).
-Robert
However, the 3d2606 patch differs too wildly from 2.6.34 to allow
it to be used here. So leave things well enough alone for now.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
As seen on stable ML:
On Fri, 2011-06-24 at 11:03 +0900, J. R. Okajima wrote:
> > Paul Gortmaker:
>> > > By the commit af7fa16 2010-08-03 NFS: Fix up the fsync code
>> > > close(2) became returning the non-zero value even if it went well.
>> > > nfs_file_fsync() should return 0 when "status" is positive.
>> > >
>> > > [PG: in 34, nfs_file_fsync is just a wrapper around nfs_do_fsync,
>> > > so the related code and actual change lands in nfs_do_fsync here.]
> >
> > In these 247 patches, I could not find the backport of
> > af7fa16 2010-08-03 NFS: Fix up the fsync code
> > If you bring the commit af7fa16 into 2.6.34.10, then you will need this
> > one (0702099bd in upstream) too. Otherwise I am afraid it is
> > unnecessary.
> > But I'd ask a reply from Trond Myklebust.
I agree.
Cheers
Trond
-- Trond Myklebust Linux NFS client maintainer
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Thanks to Ben Hutchings for pointing this out.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Thanks to Libor Pechacek for catching this.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
As taken from stable mailing list:
On Thu, 23 Jun 2011, Paul Gortmaker wrote:
> From: Alan Stern <stern@rowland.harvard.edu>
>
> -------------------
> This is a commit scheduled for the next v2.6.34 longterm release.
> If you see a problem with using this for longterm, please comment.
> -------------------
>
> commit d199c96d41d80a567493e12b8e96ea056a1350c1 upstream.
>
> If anyone comes across a high-speed hub that (by mistake or by design)
> claims to have no Transaction Translators, plugging a full- or
> low-speed device into it will cause the USB stack to crash. This
> patch (as1446) prevents the problem by ignoring such devices, since
> the kernel has no way to communicate with them.
This commit had some unexpected fallout. It shouldn't be merged unless
the following upstream commits are also merged:
c5c69f3f0dcf9b569c8f3ad67f3af92cfcedac43
cee6a262550f53a13acfefbc1e3e5ff35c96182c
ec95d35a6bd0047f05fe8a21e6c52f8bb418da55
Alan Stern
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Thanks to Alan Stern for pointing this out.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Thanks to Olaf Hering for pointing this out.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Thanks to Dan Rosenberg for pointing this out.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
---- v2.6.32.36 ----
Commit Parent Parent in In 34.x Notes
========================================================================
856460aa 14988a4d v2.6.39 n
8f2056b1 47e9037a v2.6.39 n
c2234bf9 bee4c36a v2.6.39 n
5b390b74 e91f90bb v2.6.39 n
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
This is pretty much the raw data, with the exception of marking
the one-commit-release reverts in 35 and 38.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
We've not allocated any pages yet, so a simple return is OK,
but since all the other exit paths are using the out label,
make this consistent with those vs. what was in the upstream.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Per discussion on stable list (Apr 14, 2011):
----
This only works starting from 2.6.36.
before 2.6.36 kernel, oom-killer's badness() uses mm->total_vm. Please
see the patch for pre2.6.36 kernel below.
Oleg.
----
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Somehow I managed to break this one cherry pick into two commits.
Remarry the chunks back together.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
De-bundle the two commits into their constituent upstream bits so
that the audit and check scripts don't get confused.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
